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

h264: rewrite has_b_frame calculation code,

Browse Source 
the previous implementation was too buggy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-11-16 23:58:06 +01:00
parent 18b7f40007
commit bfca35114a
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/h264.c
View File

@@ -1474,6 +1474,24 @@ static void decode_postinit(H264Context *h, int setup_finished){
s->low_delay= 0; s->low_delay= 0;
} }
for (i = 0; 1; i++) {
if(i == MAX_DELAYED_PIC_COUNT || cur->poc < h->last_pocs[i]){
if(i)
h->last_pocs[i-1] = cur->poc;
break;
} else if(i) {
h->last_pocs[i-1]= h->last_pocs[i];
}
}
out_of_order = MAX_DELAYED_PIC_COUNT - i;
if(s->low_delay && cur->f.pict_type == AV_PICTURE_TYPE_B)
out_of_order = FFMAX(out_of_order, 1);
if(s->avctx->has_b_frames < out_of_order && !h->sps.bitstream_restriction_flag){
av_log(s->avctx, AV_LOG_WARNING, "Increasing reorder buffer to %d\n", out_of_order);
s->avctx->has_b_frames = out_of_order;
s->low_delay = 0;
}
pics = 0; pics = 0;
while(h->delayed_pic[pics]) pics++; while(h->delayed_pic[pics]) pics++;
@@ -1496,21 +1514,7 @@ static void decode_postinit(H264Context *h, int setup_finished){
if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
{ } { }
else if (out_of_order && pics-1 == s->avctx->has_b_frames && else if (s->low_delay &&
s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) {
int cnt = 0, invalid = 0;
for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) {
cnt += out->poc < h->last_pocs[i];
invalid += h->last_pocs[i] == INT_MIN;
}
if (invalid + cnt < MAX_DELAYED_PIC_COUNT) {
s->avctx->has_b_frames = FFMAX(s->avctx->has_b_frames, cnt);
} else if (cnt) {
for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++)
h->last_pocs[i] = INT_MIN;
}
s->low_delay = 0;
} else if (s->low_delay &&
((h->next_outputed_poc != INT_MIN && out->poc > h->next_outputed_poc + 2) || ((h->next_outputed_poc != INT_MIN && out->poc > h->next_outputed_poc + 2) ||
cur->f.pict_type == AV_PICTURE_TYPE_B)) { cur->f.pict_type == AV_PICTURE_TYPE_B)) {
s->low_delay = 0; s->low_delay = 0;
@@ -1524,8 +1528,6 @@ static void decode_postinit(H264Context *h, int setup_finished){
for(i=out_idx; h->delayed_pic[i]; i++) for(i=out_idx; h->delayed_pic[i]; i++)
h->delayed_pic[i] = h->delayed_pic[i+1]; h->delayed_pic[i] = h->delayed_pic[i+1];
} }
memmove(h->last_pocs, &h->last_pocs[1], sizeof(*h->last_pocs) * (MAX_DELAYED_PIC_COUNT - 1));
h->last_pocs[MAX_DELAYED_PIC_COUNT - 1] = out->poc;
if(!out_of_order && pics > s->avctx->has_b_frames){ if(!out_of_order && pics > s->avctx->has_b_frames){
h->next_output_pic = out; h->next_output_pic = out;
if (out_idx == 0 && h->delayed_pic[0] && (h->delayed_pic[0]->f.key_frame || h->delayed_pic[0]->mmco_reset)) { if (out_idx == 0 && h->delayed_pic[0] && (h->delayed_pic[0]->f.key_frame || h->delayed_pic[0]->mmco_reset)) {