RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 17:21:05 +00:00
Code Issues Projects Releases Wiki Activity

cbs_h264: Fix handling of auxiliary pictures

Browse Source 
The earlier code used the most recent non-auxiliary slice to determine
whether an auxiliary slice has the syntax of an IDR slice, even when
the most recent slice was from a slice of a redundant frame. Now only
slices of the primary coded picture are used, as the specifications
mandate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
This commit is contained in:
Andreas Rheinhardt 2018-11-07 04:47:51 +01:00 committed by Mark Thompson
parent 36348d77b8
commit 8d1cf2d894
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/cbs_h264_syntax_template.c
View File

@ -1190,11 +1190,10 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw,
"in the same access unit.\n"); "in the same access unit.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
idr_pic_flag = h264->last_slice_nal_unit_type == H264_NAL_IDR_SLICE;
} else { } else {
h264->last_slice_nal_unit_type = idr_pic_flag = current->nal_unit_header.nal_unit_type == H264_NAL_IDR_SLICE;
current->nal_unit_header.nal_unit_type;
} }
idr_pic_flag = h264->last_slice_nal_unit_type == H264_NAL_IDR_SLICE;
ue(first_mb_in_slice, 0, H264_MAX_MB_PIC_SIZE - 1); ue(first_mb_in_slice, 0, H264_MAX_MB_PIC_SIZE - 1);
ue(slice_type, 0, 9); ue(slice_type, 0, 9);
@ -1272,6 +1271,13 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw,
if (pps->redundant_pic_cnt_present_flag) if (pps->redundant_pic_cnt_present_flag)
ue(redundant_pic_cnt, 0, 127); ue(redundant_pic_cnt, 0, 127);
else
infer(redundant_pic_cnt, 0);
if (current->nal_unit_header.nal_unit_type != H264_NAL_AUXILIARY_SLICE
&& !current->redundant_pic_cnt)
h264->last_slice_nal_unit_type =
current->nal_unit_header.nal_unit_type;
if (slice_type_b) if (slice_type_b)
flag(direct_spatial_mv_pred_flag); flag(direct_spatial_mv_pred_flag);