virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/h264: mark recovery_cnt==0 frames as keyframes

Browse Source 
Fixes Ticket3063

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-03 17:24:05 +01:00
parent a75349d0c8
commit 7ef01a7878
4 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -1781,6 +1781,8 @@ static int output_frame(H264Context *h, AVFrame *dst, H264Picture *srcp)
av_dict_set(&dst->metadata, "stereo_mode", ff_h264_sei_stereo_mode(h), 0); av_dict_set(&dst->metadata, "stereo_mode", ff_h264_sei_stereo_mode(h), 0);
if (srcp->sei_recovery_frame_cnt == 0)
dst->key_frame = 1;
if (!srcp->crop) if (!srcp->crop)
return 0; return 0;

1
libavcodec/h264.h
View File

@@ -324,6 +324,7 @@ typedef struct H264Picture {
int reference; int reference;
int recovered; ///< picture at IDR or recovery point + recovery count int recovered; ///< picture at IDR or recovery point + recovery count
int invalid_gap; int invalid_gap;
int sei_recovery_frame_cnt;
int crop; int crop;
int crop_left; int crop_left;

1
libavcodec/h264_picture.c
View File

@@ -122,6 +122,7 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src)
dst->crop_top = src->crop_top; dst->crop_top = src->crop_top;
dst->recovered = src->recovered; dst->recovered = src->recovered;
dst->invalid_gap = src->invalid_gap; dst->invalid_gap = src->invalid_gap;
dst->sei_recovery_frame_cnt = src->sei_recovery_frame_cnt;
return 0; return 0;
fail: fail:

1
libavcodec/h264_slice.c
View File

@@ -744,6 +744,7 @@ static int h264_frame_start(H264Context *h)
pic->mmco_reset = 0; pic->mmco_reset = 0;
pic->recovered = 0; pic->recovered = 0;
pic->invalid_gap = 0; pic->invalid_gap = 0;
pic->sei_recovery_frame_cnt = h->sei_recovery_frame_cnt;
if ((ret = alloc_picture(h, pic)) < 0) if ((ret = alloc_picture(h, pic)) < 0)
return ret; return ret;