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: Add pointer to main context to slice contexts

Browse Source 
It is a pointer to const to allow the slice threads to inspect
values without modifying them; also make it a simple cast
for codecs that don't support slice threading.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-15 07:16:33 +01:00
parent 78391f20c8
commit 6e02882656
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegvideo.c
View File

@ -387,6 +387,8 @@ 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;
s->parent = s;
/* We initialize the copies before the original so that /* We initialize the copies before the original so that
* 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. */

4
libavcodec/mpegvideo.h
View File

@ -86,6 +86,10 @@ typedef struct MpegEncContext {
uint8_t permutated_intra_v_scantable[64]; uint8_t permutated_intra_v_scantable[64];
struct AVCodecContext *avctx; struct AVCodecContext *avctx;
union {
const struct MpegEncContext *parent;
const struct MPVMainEncContext *encparent;
};
/* The following pointer is intended for codecs sharing code /* The following pointer is intended for codecs sharing code
* between decoder and encoder and in need of a common context to do so. */ * between decoder and encoder and in need of a common context to do so. */
void *private_ctx; void *private_ctx;

12
libavcodec/mpegvideoenc.h
View File

@ -30,6 +30,7 @@
#include <float.h> #include <float.h>
#include "libavutil/avassert.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "ratecontrol.h" #include "ratecontrol.h"
@ -91,6 +92,17 @@ typedef struct MPVMainEncContext {
int64_t mc_mb_var_sum; ///< motion compensated MB variance for current frame int64_t mc_mb_var_sum; ///< motion compensated MB variance for current frame
} MPVMainEncContext; } MPVMainEncContext;
static inline const MPVMainEncContext *slice_to_mainenc(const MpegEncContext *s)
{
#ifdef NO_SLICE_THREADING_HERE
av_assert2(s->slice_context_count <= 1 &&
!(s->avctx->codec->capabilities & AV_CODEC_CAP_SLICE_THREADS));
return (const MPVMainEncContext*)s;
#else
return s->encparent;
#endif
}
#define MAX_FCODE 7 #define MAX_FCODE 7
#define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level)) #define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level))
#define INPLACE_OFFSET 16 #define INPLACE_OFFSET 16