The header is always written by the main thread, so it is
not surprising that header_bits can be moved to MPVMainEncContext
as well.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/mjpegenc.c | 14 ++++++++------
libavcodec/mpegvideo.h | 1 -
libavcodec/mpegvideo_enc.c | 6 +++---
libavcodec/mpegvideoenc.h | 2 ++
libavcodec/ratecontrol.c | 2 +-
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index fd87186fbc..a8ea63a76d 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -103,8 +103,9 @@ void ff_mjpeg_amv_encode_picture_header(MPVMainEncContext
*main)
*
* @param s The MPVEncContext.
*/
-static void mjpeg_encode_picture_frame(MPVEncContext *s)
+static void mjpeg_encode_picture_frame(MPVMainEncContext *main)
{
+ MPVEncContext *const s = &main->common;
int nbits, code, table_id;
MJpegContext *m = s->mjpeg_ctx;
uint8_t *huff_size[4] = { m->huff_size_dc_luminance,
@@ -118,7 +119,7 @@ static void mjpeg_encode_picture_frame(MPVEncContext *s)
size_t total_bits = 0;
size_t bytes_needed;
- s->header_bits = get_bits_diff(s);
+ main->header_bits = get_bits_diff(s);
// Estimate the total size first
for (int i = 0; i < m->huff_ncode; i++) {
table_id = m->huff_buffer[i].table_id;
@@ -224,6 +225,9 @@ int ff_mjpeg_encode_stuffing(MPVEncContext *s)
#if CONFIG_MJPEG_ENCODER
if (m->huffman == HUFFMAN_TABLE_OPTIMAL) {
+ /* HUFFMAN_TABLE_OPTIMAL is incompatible with slice threading,
+ * therefore the following cast is allowed. */
+ MPVMainEncContext *const main = (MPVMainEncContext*)s;
mjpeg_build_optimal_huffman(m);
@@ -236,10 +240,8 @@ int ff_mjpeg_encode_stuffing(MPVEncContext *s)
s->intra_chroma_ac_vlc_length =
s->intra_chroma_ac_vlc_last_length = m->uni_chroma_ac_vlc_len;
- /* HUFFMAN_TABLE_OPTIMAL is incompatible with slice threading,
- * therefore the following cast is allowed. */
- mjpeg_encode_picture_header((MPVMainEncContext*)s);
- mjpeg_encode_picture_frame(s);
+ mjpeg_encode_picture_header(main);
+ mjpeg_encode_picture_frame(main);
}
#endif
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 14e5e241cc..20be21a834 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -295,7 +295,6 @@ typedef struct MPVContext {
/* statistics, used for 2-pass encoding */
int mv_bits;
- int header_bits;
int i_tex_bits;
int p_tex_bits;
int i_count;
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 6d45885185..03758a387d 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1739,7 +1739,7 @@ vbv_retry:
frame_end(m);
if ((CONFIG_MJPEG_ENCODER || CONFIG_AMV_ENCODER) && s->out_format ==
FMT_MJPEG)
- ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits);
+ ff_mjpeg_encode_picture_trailer(&s->pb, m->header_bits);
if (avctx->rc_buffer_size) {
RateControlContext *rcc = &m->rc_context;
@@ -1796,7 +1796,7 @@ vbv_retry:
s->pict_type);
if (avctx->flags & AV_CODEC_FLAG_PASS1)
- assert(put_bits_count(&s->pb) == s->header_bits + s->mv_bits +
+ assert(put_bits_count(&s->pb) == m->header_bits + s->mv_bits +
s->misc_bits + s->i_tex_bits +
s->p_tex_bits);
flush_put_bits(&s->pb);
@@ -3756,7 +3756,7 @@ static int encode_picture(MPVMainEncContext *m, int
picture_number)
av_assert0(0);
}
bits= put_bits_count(&s->pb);
- s->header_bits= bits - s->last_bits;
+ m->header_bits = bits - s->last_bits;
for(i=1; i<context_count; i++){
update_duplicate_context_after_me(s->thread_context[i], s);
diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h
index 8eab164d7a..ab0f7d13c7 100644
--- a/libavcodec/mpegvideoenc.h
+++ b/libavcodec/mpegvideoenc.h
@@ -62,6 +62,8 @@ typedef struct MPVMainEncContext {
int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol
int last_lambda_for[5]; ///< last lambda for a specific pict type
+ int header_bits;
+
/* bit rate control */
int64_t total_bits;
int frame_bits; ///< bits used for the current frame
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 03466a1a43..c41682b29c 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -54,7 +54,7 @@ void ff_write_pass1_stats(MPVMainEncContext *m)
s->current_picture.mc_mb_var_sum,
s->current_picture.mb_var_sum,
s->i_count, s->skip_count,
- s->header_bits);
+ m->header_bits);
}
static double get_fps(AVCodecContext *avctx)
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
