virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

lavc/h264: replace MAX_DELAYED_PIC_COUNT by H264_MAX_DPB_FRAMES

Browse Source
This commit is contained in:
Anton Khirnov 2022-01-24 18:00:06 +01:00 committed by Andreas Rheinhardt
parent ef4537bd1b
commit b6f3334a13
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264_ps.c
View File

@ -485,7 +485,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
sps->ref_frame_count = get_ue_golomb_31(gb); sps->ref_frame_count = get_ue_golomb_31(gb);
if (avctx->codec_tag == MKTAG('S', 'M', 'V', '2')) if (avctx->codec_tag == MKTAG('S', 'M', 'V', '2'))
sps->ref_frame_count = FFMAX(2, sps->ref_frame_count); sps->ref_frame_count = FFMAX(2, sps->ref_frame_count);
if (sps->ref_frame_count > MAX_DELAYED_PIC_COUNT) { if (sps->ref_frame_count > H264_MAX_DPB_FRAMES) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"too many reference frames %d\n", sps->ref_frame_count); "too many reference frames %d\n", sps->ref_frame_count);
goto fail; goto fail;
@ -590,7 +590,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
* level */ * level */
if (!sps->bitstream_restriction_flag && if (!sps->bitstream_restriction_flag &&
(sps->ref_frame_count || avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT)) { (sps->ref_frame_count || avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT)) {
sps->num_reorder_frames = MAX_DELAYED_PIC_COUNT - 1; sps->num_reorder_frames = H264_MAX_DPB_FRAMES - 1;
for (i = 0; i < FF_ARRAY_ELEMS(level_max_dpb_mbs); i++) { for (i = 0; i < FF_ARRAY_ELEMS(level_max_dpb_mbs); i++) {
if (level_max_dpb_mbs[i][0] == sps->level_idc) { if (level_max_dpb_mbs[i][0] == sps->level_idc) {
sps->num_reorder_frames = FFMIN(level_max_dpb_mbs[i][1] / (sps->mb_width * sps->mb_height), sps->num_reorder_frames = FFMIN(level_max_dpb_mbs[i][1] / (sps->mb_width * sps->mb_height),

12
libavcodec/h264_slice.c
View File

@ -1456,7 +1456,7 @@ static int h264_select_output_frame(H264Context *h)
} }
for (i = 0; 1; i++) { for (i = 0; 1; i++) {
if(i == MAX_DELAYED_PIC_COUNT || cur->poc < h->last_pocs[i]){ if(i == H264_MAX_DPB_FRAMES || cur->poc < h->last_pocs[i]){
if(i) if(i)
h->last_pocs[i-1] = cur->poc; h->last_pocs[i-1] = cur->poc;
break; break;
@ -1464,13 +1464,13 @@ static int h264_select_output_frame(H264Context *h)
h->last_pocs[i-1]= h->last_pocs[i]; h->last_pocs[i-1]= h->last_pocs[i];
} }
} }
out_of_order = MAX_DELAYED_PIC_COUNT - i; out_of_order = H264_MAX_DPB_FRAMES - i;
if( cur->f->pict_type == AV_PICTURE_TYPE_B if( cur->f->pict_type == AV_PICTURE_TYPE_B
|| (h->last_pocs[MAX_DELAYED_PIC_COUNT-2] > INT_MIN && h->last_pocs[MAX_DELAYED_PIC_COUNT-1] - (int64_t)h->last_pocs[MAX_DELAYED_PIC_COUNT-2] > 2)) || (h->last_pocs[H264_MAX_DPB_FRAMES-2] > INT_MIN && h->last_pocs[H264_MAX_DPB_FRAMES-1] - (int64_t)h->last_pocs[H264_MAX_DPB_FRAMES-2] > 2))
out_of_order = FFMAX(out_of_order, 1); out_of_order = FFMAX(out_of_order, 1);
if (out_of_order == MAX_DELAYED_PIC_COUNT) { if (out_of_order == H264_MAX_DPB_FRAMES) {
av_log(h->avctx, AV_LOG_VERBOSE, "Invalid POC %d<%d\n", cur->poc, h->last_pocs[0]); av_log(h->avctx, AV_LOG_VERBOSE, "Invalid POC %d<%d\n", cur->poc, h->last_pocs[0]);
for (i = 1; i < MAX_DELAYED_PIC_COUNT; i++) for (i = 1; i < H264_MAX_DPB_FRAMES; i++)
h->last_pocs[i] = INT_MIN; h->last_pocs[i] = INT_MIN;
h->last_pocs[0] = cur->poc; h->last_pocs[0] = cur->poc;
cur->mmco_reset = 1; cur->mmco_reset = 1;
@ -1484,7 +1484,7 @@ static int h264_select_output_frame(H264Context *h)
while (h->delayed_pic[pics]) while (h->delayed_pic[pics])
pics++; pics++;
av_assert0(pics <= MAX_DELAYED_PIC_COUNT); av_assert0(pics <= H264_MAX_DPB_FRAMES);
h->delayed_pic[pics++] = cur; h->delayed_pic[pics++] = cur;
if (cur->reference == 0) if (cur->reference == 0)

6
libavcodec/h264dec.h
View File

@ -52,8 +52,6 @@
#define H264_MAX_PICTURE_COUNT 36 #define H264_MAX_PICTURE_COUNT 36
#define MAX_DELAYED_PIC_COUNT 16
/* Compiling in interlaced support reduces the speed /* Compiling in interlaced support reduces the speed
* of progressive decoding by about 2%. */ * of progressive decoding by about 2%. */
#define ALLOW_INTERLACE #define ALLOW_INTERLACE
@ -465,8 +463,8 @@ typedef struct H264Context {
H264Ref default_ref[2]; H264Ref default_ref[2];
H264Picture *short_ref[32]; H264Picture *short_ref[32];
H264Picture *long_ref[32]; H264Picture *long_ref[32];
H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? H264Picture *delayed_pic[H264_MAX_DPB_FRAMES + 2]; // FIXME size?
int last_pocs[MAX_DELAYED_PIC_COUNT]; int last_pocs[H264_MAX_DPB_FRAMES];
H264Picture *next_output_pic; H264Picture *next_output_pic;
int next_outputed_poc; int next_outputed_poc;
int poc_offset; ///< PicOrderCnt_offset from SMPTE RDD-2006 int poc_offset; ///< PicOrderCnt_offset from SMPTE RDD-2006