diff mbox series

[FFmpeg-devel,1/4] avcodec/hevc_parse: restrict configurationVersion to 0 and 1

Message ID tencent_FA5A5E343D8086343F3F8F57619C36E09409@qq.com
State Accepted
Commit 372f71cdc76c1e265d5be02de1f7e9f131912e9f
Headers show
Series [FFmpeg-devel,1/4] avcodec/hevc_parse: restrict configurationVersion to 0 and 1 | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Zhao Zhili June 13, 2023, 7:37 a.m. UTC 
From: Zhao Zhili <zhilizhao@tencent.com>

The standard only defined configurationVersion 1.
configurationVersion 0 is for backward compatibility predates the
standard.

This patch reduces the chance that some malformated streams being
detected as hvcC.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
 libavcodec/hevc_parse.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c
index 29dfd479f3..1f3beed183 100644
--- a/libavcodec/hevc_parse.c
+++ b/libavcodec/hevc_parse.c
@@ -86,11 +86,11 @@  int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
 
     bytestream2_init(&gb, data, size);
 
-    if (size > 3 && (data[0] || data[1] || data[2] > 1)) {
-        /* It seems the extradata is encoded as hvcC format.
-         * Temporarily, we support configurationVersion==0 until 14496-15 3rd
-         * is finalized. When finalized, configurationVersion will be 1 and we
-         * can recognize hvcC by checking if avctx->extradata[0]==1 or not. */
+    /* data[0] == 1 is configurationVersion from 14496-15.
+     * data[0] == 0 is for backward compatibility predates the standard.
+     */
+    if (size > 3 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) {
+        /* It seems the extradata is encoded as hvcC format. */
         int i, j, num_arrays, nal_len_size;
 
         *is_nalff = 1;