[FFmpeg-cvslog] avcodec/libopenh264enc: support for colorspace and range information

Limin Wang git at videolan.org
Fri Jan 14 16:14:17 EET 2022


ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Fri Jan 14 13:53:19 2022 +0800| [008cc90d1a5fa85bb1b07c6d789be13b184d4d2a] | committer: Limin Wang

avcodec/libopenh264enc: support for colorspace and range information

Reviewed-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=008cc90d1a5fa85bb1b07c6d789be13b184d4d2a
---

 libavcodec/libopenh264enc.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index de4b85c411..5b5914c2cf 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -330,6 +330,28 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
         }
     }
 
+#if OPENH264_VER_AT_LEAST(1, 6)
+    param.sSpatialLayers[0].uiVideoFormat = VF_UNDEF;
+    if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) {
+        param.sSpatialLayers[0].bVideoSignalTypePresent = true;
+        param.sSpatialLayers[0].bFullRange = (avctx->color_range == AVCOL_RANGE_JPEG);
+    }
+
+    if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED      ||
+        avctx->color_primaries != AVCOL_PRI_UNSPECIFIED ||
+        avctx->color_trc != AVCOL_TRC_UNSPECIFIED) {
+        param.sSpatialLayers[0].bVideoSignalTypePresent = true;
+        param.sSpatialLayers[0].bColorDescriptionPresent = true;
+    }
+
+    if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED)
+        param.sSpatialLayers[0].uiColorMatrix = avctx->colorspace;
+    if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED)
+        param.sSpatialLayers[0].uiColorPrimaries = avctx->color_primaries;
+    if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED)
+        param.sSpatialLayers[0].uiTransferCharacteristics = avctx->color_trc;
+#endif
+
     if ((*s->encoder)->InitializeExt(s->encoder, &param) != cmResultSuccess) {
         av_log(avctx, AV_LOG_ERROR, "Initialize failed\n");
         return AVERROR_UNKNOWN;



More information about the ffmpeg-cvslog mailing list