RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264dec: Dont display trash before a keyframe. 

Fixes Ticket472
This may (or may not) cause problems with files that have no keyframes.
Plese open a bugreport or mail me if you have a file for which this fails.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-17 19:59:48 +02:00
parent 35f38b3ab9
commit a64b028aeb
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/h264.c
View File

@ -2262,6 +2262,7 @@ static void flush_dpb(AVCodecContext *avctx){
h->s.first_field= 0; h->s.first_field= 0;
ff_h264_reset_sei(h); ff_h264_reset_sei(h);
ff_mpeg_flush(avctx); ff_mpeg_flush(avctx);
h->sync= 0;
} }
static int init_poc(H264Context *h){ static int init_poc(H264Context *h){
@ -3711,6 +3712,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
s->current_picture_ptr->f.key_frame |= s->current_picture_ptr->f.key_frame |=
(hx->nal_unit_type == NAL_IDR_SLICE) || (hx->nal_unit_type == NAL_IDR_SLICE) ||
(h->sei_recovery_frame_cnt >= 0); (h->sei_recovery_frame_cnt >= 0);
h->sync |= !!s->current_picture_ptr->f.key_frame;
s->current_picture_ptr->sync = h->sync;
if (h->current_slice == 1) { if (h->current_slice == 1) {
if(!(s->flags2 & CODEC_FLAG2_CHUNKS)) { if(!(s->flags2 & CODEC_FLAG2_CHUNKS)) {
@ -3914,15 +3917,15 @@ static int decode_frame(AVCodecContext *avctx,
field_end(h, 0); field_end(h, 0);
if (!h->next_output_pic) { *data_size = 0; /* Wait for second field. */
/* Wait for second field. */ if (h->next_output_pic && h->next_output_pic->sync) {
*data_size = 0; h->sync |= 2*!!h->next_output_pic->f.key_frame;
if(h->sync>1 || h->next_output_pic->f.pict_type != AV_PICTURE_TYPE_B){
} else {
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*pict = *(AVFrame*)h->next_output_pic; *pict = *(AVFrame*)h->next_output_pic;
} }
} }
}
assert(pict->data[0] || !*data_size); assert(pict->data[0] || !*data_size);
ff_print_debug_info(s, pict); ff_print_debug_info(s, pict);

2
libavcodec/h264.h
View File

@ -582,6 +582,8 @@ typedef struct H264Context{
int cur_chroma_format_idc; int cur_chroma_format_idc;
int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low
int sync; ///< did we had a keyframe or recovery point
}H264Context; }H264Context;

1
libavcodec/mpegvideo.h
View File

@ -129,6 +129,7 @@ typedef struct Picture{
int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice)
int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF
int field_picture; ///< whether or not the picture was encoded in seperate fields int field_picture; ///< whether or not the picture was encoded in seperate fields
int sync; ///< has been decoded after a keyframe
int mb_var_sum; ///< sum of MB variance for current frame int mb_var_sum; ///< sum of MB variance for current frame
int mc_mb_var_sum; ///< motion compensated MB variance for current frame int mc_mb_var_sum; ///< motion compensated MB variance for current frame