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

Don't fill in frame gaps with copied refs after flush

Browse Source 
The filled in refs cause corruptions in the video frame
for a long time after it should have recovered.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Joakim Plate
2011-11-18 20:36:13 +01:00
committed by Michael Niedermayer
parent 14db3af4f2
commit babf4fe01a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@@ -2367,7 +2367,7 @@ static void implicit_weight_table(H264Context *h, int field){
static void idr(H264Context *h){ static void idr(H264Context *h){
int i; int i;
ff_h264_remove_all_refs(h); ff_h264_remove_all_refs(h);
h->prev_frame_num= 0; h->prev_frame_num= -1;
h->prev_frame_num_offset= 0; h->prev_frame_num_offset= 0;
h->prev_poc_msb= h->prev_poc_msb=
h->prev_poc_lsb= 0; h->prev_poc_lsb= 0;
@@ -2882,7 +2882,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if(h0->current_slice == 0){ if(h0->current_slice == 0){
// Shorten frame num gaps so we don't have to allocate reference frames just to throw them away // Shorten frame num gaps so we don't have to allocate reference frames just to throw them away
if(h->frame_num != h->prev_frame_num) { if(h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0) {
int unwrap_prev_frame_num = h->prev_frame_num, max_frame_num = 1<<h->sps.log2_max_frame_num; int unwrap_prev_frame_num = h->prev_frame_num, max_frame_num = 1<<h->sps.log2_max_frame_num;
if (unwrap_prev_frame_num > h->frame_num) unwrap_prev_frame_num -= max_frame_num; if (unwrap_prev_frame_num > h->frame_num) unwrap_prev_frame_num -= max_frame_num;
@@ -2896,7 +2896,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
} }
} }
while(h->frame_num != h->prev_frame_num && while(h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0 &&
h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){ h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){
Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num);