[FFmpeg-cvslog] avcodec/msmpegenc: Add MSMPEG4EncContext and move ac_stats to it
Andreas Rheinhardt
git at videolan.org
Sun Feb 13 21:25:34 EET 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Jan 28 00:21:32 2022 +0100| [20033c7da4d631385dcb2afc4ed907c3500d8372] | committer: Andreas Rheinhardt
avcodec/msmpegenc: Add MSMPEG4EncContext and move ac_stats to it
Also avoid the allocation by making it part of the context.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20033c7da4d631385dcb2afc4ed907c3500d8372
---
libavcodec/mpegvideo.h | 2 --
libavcodec/mpegvideo_enc.c | 7 -------
libavcodec/msmpeg4enc.c | 26 +++++++++++++++-----------
libavcodec/msmpeg4enc.h | 8 ++++++++
libavcodec/wmv2enc.c | 8 ++++----
5 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 5e406b9a9c..f5c9789fea 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -422,8 +422,6 @@ typedef struct MpegEncContext {
int per_mb_rl_table;
int esc3_level_length;
int esc3_run_length;
- /** [mb_intra][isChroma][level][run][last] */
- int (*ac_stats)[2][MAX_LEVEL+1][MAX_RUN+1][2];
int inter_intra_pred;
int mspel;
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8686a0e426..39fa9caf4a 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -813,12 +813,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
ff_pixblockdsp_init(&s->pdsp, avctx);
ff_qpeldsp_init(&s->qdsp);
- if (s->msmpeg4_version) {
- int ac_stats_size = 2 * 2 * (MAX_LEVEL + 1) * (MAX_RUN + 1) * 2 * sizeof(int);
- if (!(s->ac_stats = av_mallocz(ac_stats_size)))
- return AVERROR(ENOMEM);
- }
-
if (!(avctx->stats_out = av_mallocz(256)) ||
!FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix, 32) ||
!FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix, 32) ||
@@ -944,7 +938,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx)
ff_mpv_picture_free(avctx, &s->new_picture);
av_freep(&avctx->stats_out);
- av_freep(&s->ac_stats);
if(s->q_chroma_intra_matrix != s->q_intra_matrix ) av_freep(&s->q_chroma_intra_matrix);
if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index 31920b7f0d..c436f78f9d 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -148,8 +148,9 @@ av_cold void ff_msmpeg4_encode_init(MpegEncContext *s)
ff_thread_once(&init_static_once, msmpeg4_encode_init_static);
}
-static void find_best_tables(MpegEncContext * s)
+static void find_best_tables(MSMPEG4EncContext *ms)
{
+ MpegEncContext *const s = &ms->s;
int i;
int best = 0, best_size = INT_MAX;
int chroma_best = 0, best_chroma_size = INT_MAX;
@@ -169,9 +170,9 @@ static void find_best_tables(MpegEncContext * s)
int last;
const int last_size= size + chroma_size;
for(last=0; last<2; last++){
- int inter_count = s->ac_stats[0][0][level][run][last] + s->ac_stats[0][1][level][run][last];
- int intra_luma_count = s->ac_stats[1][0][level][run][last];
- int intra_chroma_count= s->ac_stats[1][1][level][run][last];
+ int inter_count = ms->ac_stats[0][0][level][run][last] + ms->ac_stats[0][1][level][run][last];
+ int intra_luma_count = ms->ac_stats[1][0][level][run][last];
+ int intra_chroma_count= ms->ac_stats[1][1][level][run][last];
if(s->pict_type==AV_PICTURE_TYPE_I){
size += intra_luma_count *rl_length[i ][level][run][last];
@@ -197,7 +198,7 @@ static void find_best_tables(MpegEncContext * s)
if(s->pict_type==AV_PICTURE_TYPE_P) chroma_best= best;
- memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2);
+ memset(ms->ac_stats, 0, sizeof(ms->ac_stats));
s->rl_table_index = best;
s->rl_chroma_table_index= chroma_best;
@@ -215,7 +216,9 @@ static void find_best_tables(MpegEncContext * s)
/* write MSMPEG4 compatible frame header */
void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
{
- find_best_tables(s);
+ MSMPEG4EncContext *const ms = (MSMPEG4EncContext*)s;
+
+ find_best_tables(ms);
align_put_bits(&s->pb);
put_bits(&s->pb, 2, s->pict_type - 1);
@@ -553,6 +556,7 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr
* escape coding (same as H.263) and more VLC tables. */
void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n)
{
+ MSMPEG4EncContext *const ms = (MSMPEG4EncContext*)s;
int level, run, last, i, j, last_index;
int last_non_zero, sign, slevel;
int code, run_diff, dc_pred_dir;
@@ -603,10 +607,10 @@ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n)
}
if(level<=MAX_LEVEL && run<=MAX_RUN){
- s->ac_stats[s->mb_intra][n>3][level][run][last]++;
+ ms->ac_stats[s->mb_intra][n>3][level][run][last]++;
}
- s->ac_stats[s->mb_intra][n > 3][40][63][0]++; //esc3 like
+ ms->ac_stats[s->mb_intra][n > 3][40][63][0]++; //esc3 like
code = get_rl_index(rl, last, run, level);
put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
@@ -679,7 +683,7 @@ const AVCodec ff_msmpeg4v2_encoder = {
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &ff_mpv_enc_class,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
- .priv_data_size = sizeof(MpegEncContext),
+ .priv_data_size = sizeof(MSMPEG4EncContext),
.init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end,
@@ -693,7 +697,7 @@ const AVCodec ff_msmpeg4v3_encoder = {
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &ff_mpv_enc_class,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
- .priv_data_size = sizeof(MpegEncContext),
+ .priv_data_size = sizeof(MSMPEG4EncContext),
.init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end,
@@ -707,7 +711,7 @@ const AVCodec ff_wmv1_encoder = {
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &ff_mpv_enc_class,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
- .priv_data_size = sizeof(MpegEncContext),
+ .priv_data_size = sizeof(MSMPEG4EncContext),
.init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end,
diff --git a/libavcodec/msmpeg4enc.h b/libavcodec/msmpeg4enc.h
index 12f8f44232..98044913b1 100644
--- a/libavcodec/msmpeg4enc.h
+++ b/libavcodec/msmpeg4enc.h
@@ -25,6 +25,14 @@
#include "config.h"
#include "mpegvideo.h"
#include "put_bits.h"
+#include "rl.h"
+
+typedef struct MSMPEG4EncContext {
+ MpegEncContext s;
+
+ /** [mb_intra][isChroma][level][run][last] */
+ unsigned ac_stats[2][2][MAX_LEVEL + 1][MAX_RUN + 1][2];
+} MSMPEG4EncContext;
void ff_msmpeg4_encode_init(MpegEncContext *s);
void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 2622f833b0..227947c146 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -28,7 +28,7 @@
#include "wmv2enc.h"
typedef struct WMV2EncContext {
- MpegEncContext s;
+ MSMPEG4EncContext msmpeg4;
WMV2Context common;
int j_type_bit;
int j_type;
@@ -43,7 +43,7 @@ typedef struct WMV2EncContext {
static int encode_ext_header(WMV2EncContext *w)
{
- MpegEncContext *const s = &w->s;
+ MpegEncContext *const s = &w->msmpeg4.s;
PutBitContext pb;
int code;
@@ -70,13 +70,13 @@ static int encode_ext_header(WMV2EncContext *w)
static av_cold int wmv2_encode_init(AVCodecContext *avctx)
{
WMV2EncContext *const w = avctx->priv_data;
- MpegEncContext *const s = &w->s;
+ MpegEncContext *const s = &w->msmpeg4.s;
s->private_ctx = &w->common;
if (ff_mpv_encode_init(avctx) < 0)
return -1;
- ff_wmv2_common_init(&w->s);
+ ff_wmv2_common_init(s);
avctx->extradata_size = 4;
avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
More information about the ffmpeg-cvslog
mailing list