diff options
| author | Mark Thompson <sw@jkqxz.net> | 2020-08-23 17:06:06 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-09-05 22:30:01 -0300 |
| commit | f070c53c7a5057248e6a4819dc967fa2c87600b0 (patch) | |
| tree | 2cf7a01691529f5a7052a8dfcc4c14f0d1cccc3a | |
| parent | 3a66177fef5dd74ad8b8cf3fdc452d0147a20e22 (diff) | |
| download | ffmpeg-f070c53c7a5057248e6a4819dc967fa2c87600b0.tar.gz | |
cbs_av1: Fix test for presence of buffer_removal_time element
The frame must be in both the spatial and temporal layers for the
operating point, not just one of them.
(cherry picked from commit b567cb8d0b664775201d843ab985f49fefeb25d5)
| -rw-r--r-- | libavcodec/cbs_av1_syntax_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index a315e8868a..ce6a66823c 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1381,7 +1381,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, int in_temporal_layer = (op_pt_idc >> priv->temporal_id ) & 1; int in_spatial_layer = (op_pt_idc >> (priv->spatial_id + 8)) & 1; if (seq->operating_point_idc[i] == 0 || - in_temporal_layer || in_spatial_layer) { + (in_temporal_layer && in_spatial_layer)) { fbs(seq->decoder_model_info.buffer_removal_time_length_minus_1 + 1, buffer_removal_time[i], 1, i); } |