[FFmpeg-cvslog] lavc/libopenh264: refine the code
Jun Zhao
git at videolan.org
Sat Apr 22 13:41:33 EEST 2023
ffmpeg | branch: master | Jun Zhao <mypopydev at gmail.com> | Tue Apr 18 23:19:18 2023 +0800| [73ddcad990e2c9c050df6b57509d11137e61eae4] | committer: Jun Zhao
lavc/libopenh264: refine the code
refine the code
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73ddcad990e2c9c050df6b57509d11137e61eae4
---
libavcodec/libopenh264enc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index cccc11fbb7..3c605fe8ea 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -313,7 +313,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
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);
} else if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P)
param.sSpatialLayers[0].bFullRange = 1;
@@ -321,7 +320,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
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;
}
@@ -331,6 +329,9 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
param.sSpatialLayers[0].uiColorPrimaries = avctx->color_primaries;
if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED)
param.sSpatialLayers[0].uiTransferCharacteristics = avctx->color_trc;
+
+ param.sSpatialLayers[0].bVideoSignalTypePresent =
+ (param.sSpatialLayers[0].bFullRange || param.sSpatialLayers[0].bColorDescriptionPresent);
#endif
if ((*s->encoder)->InitializeExt(s->encoder, ¶m) != cmResultSuccess) {
More information about the ffmpeg-cvslog
mailing list