diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-06-20 01:45:10 +0200 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-07-27 22:00:43 +0100 |
| commit | c2a91645c5b5cd6ed32089ec79cbb667326a8d8a (patch) | |
| tree | 3466ef47faca5d30917d7eccd0392d1d0325b1c7 /libavcodec/cbs_mpeg2.c | |
| parent | 47b6ca0b022a413e392707464f2423795aa89bfb (diff) | |
| download | ffmpeg-streaming-c2a91645c5b5cd6ed32089ec79cbb667326a8d8a.zip ffmpeg-streaming-c2a91645c5b5cd6ed32089ec79cbb667326a8d8a.tar.gz | |
mpeg2_metadata, cbs_mpeg2: Fix handling of colour_description
If a sequence display extension is read with colour_description equal to
zero, but a user wants to add one or more of the colour_description
elements, then the colour_description elements the user did not explicitly
request to be set are set to zero and not to the value equal to
unknown/unspecified (namely 2). A value of zero is not only inappropriate,
but explicitly forbidden. This is fixed by inferring the right default
values during the reading process if the elements are absent; moreover,
changing any of the colour_description elements to zero is now no longer
possible.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/cbs_mpeg2.c')
| -rw-r--r-- | libavcodec/cbs_mpeg2.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index cb202f8..ac2a7b0 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -82,6 +82,10 @@ (get_bits_left(rw) >= width && \ (var = show_bits(rw, width)) == (compare)) +#define infer(name, value) do { \ + current->name = value; \ + } while (0) + #include "cbs_mpeg2_syntax_template.c" #undef READ @@ -91,6 +95,7 @@ #undef xsi #undef marker_bit #undef nextbits +#undef infer #define WRITE @@ -116,6 +121,15 @@ #define nextbits(width, compare, var) (var) +#define infer(name, value) do { \ + if (current->name != (value)) { \ + av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \ + "%s does not match inferred value: " \ + "%"PRId64", but should be %"PRId64".\n", \ + #name, (int64_t)current->name, (int64_t)(value)); \ + } \ + } while (0) + #include "cbs_mpeg2_syntax_template.c" #undef WRITE @@ -125,6 +139,7 @@ #undef xsi #undef marker_bit #undef nextbits +#undef infer static void cbs_mpeg2_free_user_data(void *unit, uint8_t *content) |
