diff options
| author | Jun Zhao <mypopydev@gmail.com> | 2023-04-18 23:19:18 +0800 |
|---|---|---|
| committer | Jun Zhao <barryjzhao@tencent.com> | 2023-04-22 18:39:27 +0800 |
| commit | 73ddcad990e2c9c050df6b57509d11137e61eae4 (patch) | |
| tree | 789445c5de19b7c8200fb66bd76bb99f3540227d | |
| parent | de5e2570f07ec1d801c739e13a98ec717899fb3f (diff) | |
| download | ffmpeg-73ddcad990e2c9c050df6b57509d11137e61eae4.tar.gz | |
lavc/libopenh264: refine the code
refine the code
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
| -rw-r--r-- | libavcodec/libopenh264enc.c | 5 |
1 files 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) { |