X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=82a810d61794dad65817b130262023ed5d40ea91;hb=af44bff549c39ac8bb6e42a791e7a211e1013526;hp=27bd7de45daa2022ec46d38c2793d32b30cfd1ce;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 27bd7de4..82a810d6 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -335,38 +335,48 @@ int FileFFMPEG::colormodel_supported(int colormodel)
 	return colormodel;
 }
 
-int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
+
+int FileFFMPEG::get_best_colormodel(int driver, int vstream)
 {
+	if( vstream < 0 ) vstream = 0;
+	int is_mpeg = !ff ? 0 : ff->ff_video_mpeg_color_range(vstream);
+
 	switch(driver) {
 	case PLAYBACK_X11:
-		return BC_RGB888;
-	case PLAYBACK_X11_XV:
-	case PLAYBACK_ASYNCHRONOUS:
-		return BC_YUV888;
-	case PLAYBACK_X11_GL:
-		return BC_YUV888;
-	case PLAYBACK_DV1394:
-	case PLAYBACK_FIREWIRE:
-		return BC_YUV422P;
-	case VIDEO4LINUX2:
-		return BC_RGB888;
-	case VIDEO4LINUX2JPEG:
-		return BC_COMPRESSED;
-	case CAPTURE_DVB:
-	case VIDEO4LINUX2MPEG:
-		return BC_YUV422P;
-	case CAPTURE_JPEG_WEBCAM:
-		return BC_COMPRESSED;
-	case CAPTURE_YUYV_WEBCAM:
-		return BC_YUV422;
-	case CAPTURE_FIREWIRE:
-	case CAPTURE_IEC61883:
-		return BC_YUV422P;
+	case PLAYBACK_X11_GL: return is_mpeg ? BC_YUV888 : BC_RGB888;
+	case PLAYBACK_X11_XV: return BC_YUV420P;
 	}
 
 	return BC_RGB888;
 }
 
+int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
+{
+	switch(driver) {
+// the direct X11 color model requires scaling in the codec
+	case PLAYBACK_X11:
+	case PLAYBACK_X11_GL: return BC_RGB888;
+	case PLAYBACK_X11_XV: return BC_YUV420P;
+	}
+
+	return BC_YUV420P;
+}
+
+int FileFFMPEG::can_render(const char *fformat, const char *type)
+{
+	FileSystem fs;
+	char option_path[BCTEXTLEN];
+	FFMPEG::set_option_path(option_path, type);
+	fs.update(option_path);
+	int total_files = fs.total_files();
+	for( int i=0; i<total_files; ++i ) {
+		const char *name = fs.get_entry(i)->get_name();
+		const char *ext = strrchr(name,'.');
+		if( !ext ) continue;
+		if( !strcmp(fformat, ++ext) ) return 1;
+	}
+	return 0;
+}
 
 int FileFFMPEG::get_ff_option(const char *nm, const char *options, char *value)
 {