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/mpegvideo_enc: Precalculate which frames to reconstruct

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-01 01:48:08 +01:00
parent d8c7925e32
commit 4d79175b9a
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.h
View File

@@ -499,6 +499,9 @@ typedef struct MpegEncContext {
int lmin, lmax; int lmin, lmax;
int vbv_ignore_qmax; int vbv_ignore_qmax;
/// Bitfield containing information which frames to reconstruct.
int frame_reconstruction_bitfield;
/* flag to indicate a reinitialization is required, e.g. after /* flag to indicate a reinitialization is required, e.g. after
* a frame size change */ * a frame size change */
int context_reinit; int context_reinit;

16
libavcodec/mpegvideo_enc.c
View File

@@ -897,6 +897,18 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
AV_CODEC_FLAG_INTERLACED_ME) || AV_CODEC_FLAG_INTERLACED_ME) ||
s->alternate_scan); s->alternate_scan);
if (avctx->flags & AV_CODEC_FLAG_PSNR || avctx->mb_decision == FF_MB_DECISION_RD ||
s->frame_skip_threshold || s->frame_skip_factor) {
s->frame_reconstruction_bitfield = (1 << AV_PICTURE_TYPE_I) |
(1 << AV_PICTURE_TYPE_P) |
(1 << AV_PICTURE_TYPE_B);
} else if (!s->intra_only) {
s->frame_reconstruction_bitfield = (1 << AV_PICTURE_TYPE_I) |
(1 << AV_PICTURE_TYPE_P);
} else {
s->frame_reconstruction_bitfield = 0;
}
if (s->lmin > s->lmax) { if (s->lmin > s->lmax) {
av_log(avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax); av_log(avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax);
s->lmin = s->lmax; s->lmin = s->lmax;
@@ -1122,9 +1134,7 @@ static void mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64])
} }
} }
if ((s->avctx->flags & AV_CODEC_FLAG_PSNR) || s->frame_skip_threshold || s->frame_skip_factor || if ((1 << s->pict_type) & s->frame_reconstruction_bitfield) {
!((s->intra_only || s->pict_type == AV_PICTURE_TYPE_B) &&
s->avctx->mb_decision != FF_MB_DECISION_RD)) { // FIXME precalc
uint8_t *dest_y = s->dest[0], *dest_cb = s->dest[1], *dest_cr = s->dest[2]; uint8_t *dest_y = s->dest[0], *dest_cb = s->dest[1], *dest_cr = s->dest[2];
int dct_linesize, dct_offset; int dct_linesize, dct_offset;
const int linesize = s->cur_pic.linesize[0]; const int linesize = s->cur_pic.linesize[0];