virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/h264_slice: Move h264_init_ps() call into h264_field_start()

Browse Source 
This was missing from f512e4a390

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-07-19 22:31:56 +02:00
parent fd1588919d
commit 9bf3fdcd3c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_slice.c
View File

@@ -1128,13 +1128,17 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl
* or a second field in a pair and does the necessary setup. * or a second field in a pair and does the necessary setup.
*/ */
static int h264_field_start(H264Context *h, const H264SliceContext *sl, static int h264_field_start(H264Context *h, const H264SliceContext *sl,
const H2645NAL *nal) const H2645NAL *nal, int first_slice)
{ {
int i; int i;
const SPS *sps; const SPS *sps;
int last_pic_structure, last_pic_droppable, ret; int last_pic_structure, last_pic_droppable, ret;
ret = h264_init_ps(h, sl, first_slice);
if (ret < 0)
return ret;
sps = h->ps.sps; sps = h->ps.sps;
last_pic_droppable = h->droppable; last_pic_droppable = h->droppable;
@@ -1452,11 +1456,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
} }
} }
// TODO: should probably be moved to h264_field_start()
ret = h264_init_ps(h, sl, first_slice);
if (ret < 0)
return ret;
sps = (const SPS*)h->ps.sps_list[pps->sps_id]->data; sps = (const SPS*)h->ps.sps_list[pps->sps_id]->data;
frame_num = get_bits(&sl->gb, sps->log2_max_frame_num); frame_num = get_bits(&sl->gb, sps->log2_max_frame_num);
@@ -1661,13 +1660,14 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
const H2645NAL *nal) const H2645NAL *nal)
{ {
int i, j, ret = 0; int i, j, ret = 0;
int first_slice = sl == h->slice_ctx && !h->current_slice;
ret = h264_slice_header_parse(h, sl, nal); ret = h264_slice_header_parse(h, sl, nal);
if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ... if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ...
return ret; return ret;
if (h->current_slice == 0) { if (h->current_slice == 0) {
ret = h264_field_start(h, sl, nal); ret = h264_field_start(h, sl, nal, first_slice);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }