ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> |
Thu Jun 19 15:22:34 2025 +0200| [05510dac6b84354aad1c879e6d1d3d43861190a1] |
committer: Andreas Rheinhardt
avcodec/mpegvideo: Move flipflop_rounding to {MSMPEG4Dec,MPVEnc}Context
Forgotten in 9964212545554d9ae1afaabd23a7f9a361997d01.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05510dac6b84354aad1c879e6d1d3d43861190a1
---
libavcodec/mpegvideo.h | 1 -
libavcodec/mpegvideo_enc.c | 14 +++++++-------
libavcodec/mpegvideoenc.h | 1 +
libavcodec/msmpeg4dec.c | 8 ++++----
libavcodec/msmpeg4dec.h | 1 +
libavcodec/msmpeg4enc.c | 4 ++--
libavcodec/wmv2enc.c | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index fe3ae97f5d..a439c1878b 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -265,7 +265,6 @@ typedef struct MpegEncContext {
/* MSMPEG4 specific */
int slice_height; ///< in macroblocks
int first_slice_line; ///< used in MPEG-4 too to handle resync markers
- int flipflop_rounding;
enum {
MSMP4_UNUSED,
MSMP4_V1,
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 1ceb6296c4..8a38e54982 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -927,7 +927,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
s->c.modified_quant = s->c.h263_aic;
s->c.loop_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1
: 0;
s->c.unrestricted_mv = s->c.obmc || s->c.loop_filter || s->c.umvplus;
- s->c.flipflop_rounding = 1;
+ s->flipflop_rounding = 1;
/* /Fx */
/* These are just to be sure */
@@ -968,7 +968,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
s->c.out_format = FMT_H263;
s->c.h263_pred = 1;
s->c.unrestricted_mv = 1;
- s->c.flipflop_rounding = 1;
+ s->flipflop_rounding = 1;
s->c.low_delay = m->max_b_frames ? 0 : 1;
avctx->delay = s->c.low_delay ? 0 : (m->max_b_frames + 1);
break;
@@ -985,7 +985,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
s->c.h263_pred = 1;
s->c.unrestricted_mv = 1;
s->c.msmpeg4_version = MSMP4_V3;
- s->c.flipflop_rounding = 1;
+ s->flipflop_rounding = 1;
avctx->delay = 0;
s->c.low_delay = 1;
break;
@@ -994,7 +994,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
s->c.h263_pred = 1;
s->c.unrestricted_mv = 1;
s->c.msmpeg4_version = MSMP4_WMV1;
- s->c.flipflop_rounding = 1;
+ s->flipflop_rounding = 1;
avctx->delay = 0;
s->c.low_delay = 1;
break;
@@ -1003,7 +1003,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
s->c.h263_pred = 1;
s->c.unrestricted_mv = 1;
s->c.msmpeg4_version = MSMP4_WMV2;
- s->c.flipflop_rounding = 1;
+ s->flipflop_rounding = 1;
avctx->delay = 0;
s->c.low_delay = 1;
break;
@@ -2022,7 +2022,7 @@ vbv_retry:
s->c.mb_skipped = 0; // done in frame_start()
// done in encode_picture() so we must undo it
if (s->c.pict_type == AV_PICTURE_TYPE_P) {
- s->c.no_rounding ^= s->c.flipflop_rounding;
+ s->c.no_rounding ^= s->flipflop_rounding;
}
if (s->c.pict_type != AV_PICTURE_TYPE_B) {
s->c.time_base = s->c.last_time_base;
@@ -3734,7 +3734,7 @@ static int encode_picture(MPVMainEncContext *const m,
const AVPacket *pkt)
if (s->c.pict_type == AV_PICTURE_TYPE_I) {
s->c.no_rounding = s->c.msmpeg4_version >= MSMP4_V3;
} else if (s->c.pict_type != AV_PICTURE_TYPE_B) {
- s->c.no_rounding ^= s->c.flipflop_rounding;
+ s->c.no_rounding ^= s->flipflop_rounding;
}
if (s->c.avctx->flags & AV_CODEC_FLAG_PASS2) {
diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h
index 8ad2fe2e8a..2a04abab26 100644
--- a/libavcodec/mpegvideoenc.h
+++ b/libavcodec/mpegvideoenc.h
@@ -155,6 +155,7 @@ typedef struct MPVEncContext {
PutBitContext pb2; ///< used for data partitioned VOPs
/* MSMPEG4 specific */
+ int flipflop_rounding; ///< also used for MPEG-4, H.263+
int esc3_level_length;
/* RTP specific */
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index df5ab5186e..55e51aff3c 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -544,7 +544,7 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
ms->per_mb_rl_table,
s->qscale);
- if(s->flipflop_rounding){
+ if (ms->flipflop_rounding) {
s->no_rounding ^= 1;
}else{
s->no_rounding = 0;
@@ -570,13 +570,13 @@ int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int
buf_size)
skip_bits(&s->gb, 5); /* fps */
ms->bit_rate = get_bits(&s->gb, 11) * 1024;
if (s->msmpeg4_version >= MSMP4_V3)
- s->flipflop_rounding= get_bits1(&s->gb);
+ ms->flipflop_rounding = get_bits1(&s->gb);
else
- s->flipflop_rounding= 0;
+ ms->flipflop_rounding = 0;
}
else if(left<length+8)
{
- s->flipflop_rounding= 0;
+ ms->flipflop_rounding = 0;
if (s->msmpeg4_version != MSMP4_V2)
av_log(s->avctx, AV_LOG_ERROR, "ext header missing, %d left\n",
left);
}
diff --git a/libavcodec/msmpeg4dec.h b/libavcodec/msmpeg4dec.h
index b04331fd47..862c50b3f0 100644
--- a/libavcodec/msmpeg4dec.h
+++ b/libavcodec/msmpeg4dec.h
@@ -31,6 +31,7 @@
typedef struct MSMP4DecContext {
MpegEncContext m;
int bit_rate;
+ int flipflop_rounding;
int mv_table_index;
int rl_table_index;
int rl_chroma_table_index;
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index 3449328b3c..bcb4af23e9 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -298,9 +298,9 @@ void ff_msmpeg4_encode_ext_header(MPVEncContext *const s)
put_bits(&s->pb, 11, FFMIN(m->bit_rate / 1024, 2047));
if (s->c.msmpeg4_version >= MSMP4_V3)
- put_bits(&s->pb, 1, s->c.flipflop_rounding);
+ put_bits(&s->pb, 1, s->flipflop_rounding);
else
- av_assert0(!s->c.flipflop_rounding);
+ av_assert0(!s->flipflop_rounding);
}
void ff_msmpeg4_encode_motion(MSMPEG4EncContext *const ms,
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 592d1060d3..0eef5b7cfb 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -94,7 +94,7 @@ static int wmv2_encode_picture_header(MPVMainEncContext
*const m)
w->abt_type = 0;
w->j_type = 0;
- av_assert0(s->c.flipflop_rounding);
+ av_assert0(s->flipflop_rounding);
if (s->c.pict_type == AV_PICTURE_TYPE_I) {
av_assert0(s->c.no_rounding == 1);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
