#488 Fixed bug where HD material was always recorded using the BT.601 color matrix...

diff --git a/CHANGELOG b/CHANGELOG
index 749f02d6fdade2c8a7ec372ed633999e79e95bdc..00a47ab3c2977338e3d9a44d63f8e3937af224f7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,14 @@ General
   o Created automatically generated build number, so that it is easier to see\r
     whether a build is newer or older than an other.\r
 \r
+Consumers\r
+---------\r
+\r
+  o FFmpeg consumer:\r
+    + Fixed long overdue bug where HD material was always recorded using the\r
+      BT.601 color matrix instead of the BT.709 color matrix. RGB codecs like\r
+      qtrle was never affected but all the YCbCr based codecs were.\r
+\r
 Producers\r
 ---------\r
 \r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index e6f1ded380c494182a1ef8e95407bd8f5b861676..25f2b87b01dd695f08b5a9043e21ba7098f2b48e 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -702,6 +702,11 @@ private:
 
                adjust_video_filter(codec, in_video_format_, filt_vsink, filtergraph);
 
+               if (in_video_format_.width < 1280)
+                       video_graph_->scale_sws_opts = "out_color_matrix=bt601";
+               else
+                       video_graph_->scale_sws_opts = "out_color_matrix=bt709";
+
                configure_filtergraph(
                                *video_graph_,
                                filtergraph,