har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"

Browse Source 
This reverts commit 796027f22154c799e0063e2457b31e0cfd1dddae, reversing
changes made to bca30ed2b67f095fd31e07319a622ac30ad22978.

Preemptive revert before further testing has been done.
This commit is contained in:
Timothy Gu 2016-08-03 17:06:43 -07:00
parent 796027f221
commit e4af9be0f4
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264_slice.c
View File

@ -1497,8 +1497,6 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl,
h->nb_mmco = sl->nb_mmco; h->nb_mmco = sl->nb_mmco;
h->explicit_ref_marking = sl->explicit_ref_marking; h->explicit_ref_marking = sl->explicit_ref_marking;
h->picture_idr = nal->type == H264_NAL_IDR_SLICE;
/* Set the frame properties/side data. Only done for the second field in /* Set the frame properties/side data. Only done for the second field in
* field coded frames, since some SEI information is present for each field * field coded frames, since some SEI information is present for each field
* and is merged by the SEI parsing code. */ * and is merged by the SEI parsing code. */
@ -1831,11 +1829,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
} }
} }
if (h->picture_idr && nal->type != H264_NAL_IDR_SLICE) {
av_log(h->avctx, AV_LOG_ERROR, "Invalid mix of IDR and non-IDR slices\n");
return AVERROR_INVALIDDATA;
}
av_assert1(h->mb_num == h->mb_width * h->mb_height); av_assert1(h->mb_num == h->mb_width * h->mb_height);
if (sl->first_mb_addr << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num || if (sl->first_mb_addr << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num ||
sl->first_mb_addr >= h->mb_num) { sl->first_mb_addr >= h->mb_num) {

6
libavcodec/h264dec.c
View File

@ -783,6 +783,12 @@ again:
ret = -1; ret = -1;
goto end; goto end;
} }
if (nal->type != H264_NAL_IDR_SLICE) {
av_log(h->avctx, AV_LOG_ERROR,
"Invalid mix of idr and non-idr slices\n");
ret = -1;
goto end;
}
if(!idr_cleared) { if(!idr_cleared) {
if (h->current_slice && (avctx->active_thread_type & FF_THREAD_SLICE)) { if (h->current_slice && (avctx->active_thread_type & FF_THREAD_SLICE)) {
av_log(h, AV_LOG_ERROR, "invalid mixed IDR / non IDR frames cannot be decoded in slice multithreading mode\n"); av_log(h, AV_LOG_ERROR, "invalid mixed IDR / non IDR frames cannot be decoded in slice multithreading mode\n");

5
libavcodec/h264dec.h
View File

@ -384,11 +384,6 @@ typedef struct H264Context {
*/ */
int postpone_filter; int postpone_filter;
/*
* Set to 1 when the current picture is IDR, 0 otherwise.
*/
int picture_idr;
int8_t(*intra4x4_pred_mode); int8_t(*intra4x4_pred_mode);
H264PredContext hpc; H264PredContext hpc;