memory leaks and tweaks, sams histeq icon

[goodguy/history.git] / cinelerra-5.1 / cinelerra / fileffmpeg.C

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index f3f535681234e3bbefe1a17d841eae4443458c55..82a810d61794dad65817b130262023ed5d40ea91 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -335,13 +335,28 @@ int FileFFMPEG::colormodel_supported(int colormodel)
        return colormodel;
 }
 
+
+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:
+       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: return BC_BGR8888;
-//     case PLAYBACK_X11: return BC_RGB888;
+       case PLAYBACK_X11:
        case PLAYBACK_X11_GL: return BC_RGB888;
+       case PLAYBACK_X11_XV: return BC_YUV420P;
        }
 
        return BC_YUV420P;