virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mpegvideo: Support custom slice context sizes

Browse Source 
This is in preparation for adding a special slice context for
the encoders and moving all the encoder-specific fields to it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-16 14:52:36 +01:00
parent 1b537de8d4
commit f293f95632
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.c
View File

@ -375,6 +375,7 @@ static av_cold int init_duplicate_context(MpegEncContext *s)
av_cold int ff_mpv_init_duplicate_contexts(MpegEncContext *s) av_cold int ff_mpv_init_duplicate_contexts(MpegEncContext *s)
{ {
int nb_slices = s->slice_context_count, ret; int nb_slices = s->slice_context_count, ret;
size_t slice_size = s->slice_ctx_size ? s->slice_ctx_size : sizeof(*s);
s->parent = s; s->parent = s;
@ -382,7 +383,7 @@ av_cold int ff_mpv_init_duplicate_contexts(MpegEncContext *s)
* fields allocated in init_duplicate_context are NULL after * fields allocated in init_duplicate_context are NULL after
* copying. This prevents double-frees upon allocation error. */ * copying. This prevents double-frees upon allocation error. */
for (int i = 1; i < nb_slices; i++) { for (int i = 1; i < nb_slices; i++) {
s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext)); s->thread_context[i] = av_memdup(s, slice_size);
if (!s->thread_context[i]) if (!s->thread_context[i])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if ((ret = init_duplicate_context(s->thread_context[i])) < 0) if ((ret = init_duplicate_context(s->thread_context[i])) < 0)

3
libavcodec/mpegvideo.h
View File

@ -469,6 +469,9 @@ typedef struct MpegEncContext {
* a frame size change */ * a frame size change */
int context_reinit; int context_reinit;
/// If set, ff_mpv_common_init() will allocate slice contexts of this size
unsigned slice_ctx_size;
ERContext er; ERContext er;
int error_rate; int error_rate;