Merge pull request #276 from cchampet/fix_codecColorParameters

cchampet · web-flow · commit 8df233b88de7 · 2016-08-22T15:28:07.000+02:00
VideoCodec: fixed value of the color parameters
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -42,6 +42,12 @@ IOutputStream& OutputFile::addVideoStream(const VideoCodec& videoDesc)
     stream.codec->level = videoDesc.getAVCodecContext().level;
     stream.codec->field_order = videoDesc.getAVCodecContext().field_order;
 
+    stream.codec->colorspace = videoDesc.getAVCodecContext().colorspace;
+    stream.codec->color_primaries = videoDesc.getAVCodecContext().color_primaries;
+    stream.codec->color_range = videoDesc.getAVCodecContext().color_range;
+    stream.codec->color_trc = videoDesc.getAVCodecContext().color_trc;
+    stream.codec->chroma_sample_location = videoDesc.getAVCodecContext().chroma_sample_location;
+
     setOutputStream(stream, videoDesc);
 
     // need to set the time_base on the AVCodecContext and the AVStream
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -173,9 +173,9 @@ std::string VideoProperties::getColorRange() const
         case AVCOL_RANGE_UNSPECIFIED:
             return "unspecified";
         case AVCOL_RANGE_MPEG:
-            return "Head";
+            return "Limited"; //< legal TV range: 16-235 with 8bits
         case AVCOL_RANGE_JPEG:
-            return "Full";
+            return "Full"; // full range: 0-255 with 8bits
         case AVCOL_RANGE_NB:
             return "Not ABI";
         default:
