History

cbs_av1: Don't reject unknown metadata

Accept it and pass it through unchanged. The standard requires that decoders ignore unknown metadata, and indeed this is tested by some of the Argon coverage streams.

Mark Thompson committed 3 years ago

Commit dce6cf21 parent bee912c3 files · +38 −2Browse files

Unified · Split

3 files
  1. libavcodec/cbs_av1.c +7 −0
  2. libavcodec/cbs_av1.h +7 −0
  3. libavcodec/cbs_av1_syntax_template.c +24 −2
libavcodec/cbs_av1.c+7−0
@@ -1306,9 +1306,16 @@ static void cbs_av1_free_metadata(void *unit, uint8_t *content) · 1305 unmodified lines
1306 md = &obu->obu.metadata;1306 md = &obu->obu.metadata;
1307 1307
1308 switch (md->metadata_type) {1308 switch (md->metadata_type) {
1309 case AV1_METADATA_TYPE_HDR_CLL:
1310 case AV1_METADATA_TYPE_HDR_MDCV:
1311 case AV1_METADATA_TYPE_SCALABILITY:
1312 case AV1_METADATA_TYPE_TIMECODE:
1313 break;
1309 case AV1_METADATA_TYPE_ITUT_T35:1314 case AV1_METADATA_TYPE_ITUT_T35:
1310 av_buffer_unref(&md->metadata.itut_t35.payload_ref);1315 av_buffer_unref(&md->metadata.itut_t35.payload_ref);
1311 break;1316 break;
1317 default:
1318 av_buffer_unref(&md->metadata.unknown.payload_ref);
1312 }1319 }
1313 av_free(content);1320 av_free(content);
1314}1321}
libavcodec/cbs_av1.h+7−0
@@ -370,6 +370,12 @@ typedef struct AV1RawMetadataTimecode { · 369 unmodified lines
370 uint32_t time_offset_value;370 uint32_t time_offset_value;
371} AV1RawMetadataTimecode;371} AV1RawMetadataTimecode;
372 372
373typedef struct AV1RawMetadataUnknown {
374 uint8_t *payload;
375 AVBufferRef *payload_ref;
376 size_t payload_size;
377} AV1RawMetadataUnknown;
378
373typedef struct AV1RawMetadata {379typedef struct AV1RawMetadata {
374 uint64_t metadata_type;380 uint64_t metadata_type;
375 union {381 union {
@@ -378,6 +384,7 @@ typedef struct AV1RawMetadata { · 2 unmodified lines
378 AV1RawMetadataScalability scalability;384 AV1RawMetadataScalability scalability;
379 AV1RawMetadataITUTT35 itut_t35;385 AV1RawMetadataITUTT35 itut_t35;
380 AV1RawMetadataTimecode timecode;386 AV1RawMetadataTimecode timecode;
387 AV1RawMetadataUnknown unknown;
381 } metadata;388 } metadata;
382} AV1RawMetadata;389} AV1RawMetadata;
383 390
libavcodec/cbs_av1_syntax_template.c+24−2
@@ -2004,6 +2004,29 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, · 2003 unmodified lines
2004 return 0;2004 return 0;
2005}2005}
2006 2006
2007static int FUNC(metadata_unknown)(CodedBitstreamContext *ctx, RWContext *rw,
2008 AV1RawMetadataUnknown *current)
2009{
2010 int err;
2011 size_t i;
2012
2013 HEADER("Unknown Metadata");
2014
2015#ifdef READ
2016 current->payload_size = cbs_av1_get_payload_bytes_left(rw);
2017
2018 current->payload_ref = av_buffer_alloc(current->payload_size);
2019 if (!current->payload_ref)
2020 return AVERROR(ENOMEM);
2021 current->payload = current->payload_ref->data;
2022#endif
2023
2024 for (i = 0; i < current->payload_size; i++)
2025 fbs(8, payload[i], 1, i);
2026
2027 return 0;
2028}
2029
2007static int FUNC(metadata_obu)(CodedBitstreamContext *ctx, RWContext *rw,2030static int FUNC(metadata_obu)(CodedBitstreamContext *ctx, RWContext *rw,
2008 AV1RawMetadata *current)2031 AV1RawMetadata *current)
2009{2032{
@@ -2028,8 +2051,7 @@ static int FUNC(metadata_obu)(CodedBitstreamContext *ctx, RWContext *rw, · 18 unmodified lines
2028 CHECK(FUNC(metadata_timecode)(ctx, rw, &current->metadata.timecode));2051 CHECK(FUNC(metadata_timecode)(ctx, rw, &current->metadata.timecode));
2029 break;2052 break;
2030 default:2053 default:
2031 // Unknown metadata type.2054 CHECK(FUNC(metadata_unknown)(ctx, rw, &current->metadata.unknown));
2032 return AVERROR_PATCHWELCOME;
2033 }2055 }
2034 2056
2035 return 0;2057 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t