eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-05 22:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/mpegvideo_unquantize: Constify MPVContext pointee

Browse Source 
Also use MPVContext instead of MpegEncContext.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-11-14 11:24:45 +01:00
parent f7551e7505
commit 358c569b05
13 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/arm/mpegvideo_arm.c
View File

@@ -41,9 +41,9 @@ CHECK_OFFSET(MpegEncContext, inter_scantable.raster_end,
CHECK_OFFSET(MpegEncContext, h263_aic, H263_AIC); CHECK_OFFSET(MpegEncContext, h263_aic, H263_AIC);
#endif #endif
void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_inter_neon(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_intra_neon(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
av_cold void ff_mpv_unquantize_init_arm(MPVUnquantDSPContext *s, int bitexact) av_cold void ff_mpv_unquantize_init_arm(MPVUnquantDSPContext *s, int bitexact)

4
libavcodec/arm/mpegvideo_armv5te.c
View File

@@ -50,7 +50,7 @@ static inline void dct_unquantize_h263_helper_c(int16_t *block, int qmul, int qa
} }
#endif #endif
static void dct_unquantize_h263_intra_armv5te(MpegEncContext *s, static void dct_unquantize_h263_intra_armv5te(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int level, qmul, qadd; int level, qmul, qadd;
@@ -79,7 +79,7 @@ static void dct_unquantize_h263_intra_armv5te(MpegEncContext *s,
block[0] = level; block[0] = level;
} }
static void dct_unquantize_h263_inter_armv5te(MpegEncContext *s, static void dct_unquantize_h263_inter_armv5te(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int qmul, qadd; int qmul, qadd;

6
libavcodec/mips/h263dsp_mips.h
View File

@@ -25,11 +25,11 @@
void ff_h263_h_loop_filter_msa(uint8_t *src, int stride, int q_scale); void ff_h263_h_loop_filter_msa(uint8_t *src, int stride, int q_scale);
void ff_h263_v_loop_filter_msa(uint8_t *src, int stride, int q_scale); void ff_h263_v_loop_filter_msa(uint8_t *src, int stride, int q_scale);
void ff_dct_unquantize_mpeg2_inter_msa(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg2_inter_msa(const MPVContext *s, int16_t *block,
int32_t index, int32_t q_scale); int32_t index, int32_t q_scale);
void ff_dct_unquantize_h263_inter_msa(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_inter_msa(const MPVContext *s, int16_t *block,
int32_t index, int32_t q_scale); int32_t index, int32_t q_scale);
void ff_dct_unquantize_h263_intra_msa(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_intra_msa(const MPVContext *s, int16_t *block,
int32_t index, int32_t q_scale); int32_t index, int32_t q_scale);
int ff_pix_sum_msa(const uint8_t *pix, ptrdiff_t line_size); int ff_pix_sum_msa(const uint8_t *pix, ptrdiff_t line_size);

10
libavcodec/mips/mpegvideo_mips.h
View File

@@ -23,15 +23,15 @@
#include "libavcodec/mpegvideo.h" #include "libavcodec/mpegvideo.h"
void ff_dct_unquantize_h263_intra_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_intra_mmi(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_dct_unquantize_h263_inter_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_inter_mmi(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_dct_unquantize_mpeg1_intra_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg1_intra_mmi(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_dct_unquantize_mpeg1_inter_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg1_inter_mmi(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_dct_unquantize_mpeg2_intra_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg2_intra_mmi(const MPVContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_denoise_dct_mmi(int16_t block[64], int sum[64], const uint16_t offset[64]); void ff_denoise_dct_mmi(int16_t block[64], int sum[64], const uint16_t offset[64]);

10
libavcodec/mips/mpegvideo_mmi.c
View File

@@ -25,7 +25,7 @@
#include "mpegvideo_mips.h" #include "mpegvideo_mips.h"
#include "libavutil/mips/mmiutils.h" #include "libavutil/mips/mmiutils.h"
void ff_dct_unquantize_h263_intra_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_intra_mmi(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
int64_t level, nCoeffs; int64_t level, nCoeffs;
@@ -101,7 +101,7 @@ void ff_dct_unquantize_h263_intra_mmi(MpegEncContext *s, int16_t *block,
block[0] = level; block[0] = level;
} }
void ff_dct_unquantize_h263_inter_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_inter_mmi(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
int64_t nCoeffs; int64_t nCoeffs;
@@ -160,7 +160,7 @@ void ff_dct_unquantize_h263_inter_mmi(MpegEncContext *s, int16_t *block,
); );
} }
void ff_dct_unquantize_mpeg1_intra_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg1_intra_mmi(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
int64_t nCoeffs; int64_t nCoeffs;
@@ -254,7 +254,7 @@ void ff_dct_unquantize_mpeg1_intra_mmi(MpegEncContext *s, int16_t *block,
block[0] = block0; block[0] = block0;
} }
void ff_dct_unquantize_mpeg1_inter_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg1_inter_mmi(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
int64_t nCoeffs; int64_t nCoeffs;
@@ -342,7 +342,7 @@ void ff_dct_unquantize_mpeg1_inter_mmi(MpegEncContext *s, int16_t *block,
); );
} }
void ff_dct_unquantize_mpeg2_intra_mmi(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_mpeg2_intra_mmi(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
uint64_t nCoeffs; uint64_t nCoeffs;

6
libavcodec/mips/mpegvideo_msa.c
View File

@@ -194,7 +194,7 @@ static int32_t mpeg2_dct_unquantize_inter_msa(int16_t *block,
return sum_res; return sum_res;
} }
void ff_dct_unquantize_h263_intra_msa(MpegEncContext *s, void ff_dct_unquantize_h263_intra_msa(const MPVContext *s,
int16_t *block, int32_t index, int16_t *block, int32_t index,
int32_t qscale) int32_t qscale)
{ {
@@ -219,7 +219,7 @@ void ff_dct_unquantize_h263_intra_msa(MpegEncContext *s,
h263_dct_unquantize_msa(block, qmul, qadd, nCoeffs, 1); h263_dct_unquantize_msa(block, qmul, qadd, nCoeffs, 1);
} }
void ff_dct_unquantize_h263_inter_msa(MpegEncContext *s, void ff_dct_unquantize_h263_inter_msa(const MPVContext *s,
int16_t *block, int32_t index, int16_t *block, int32_t index,
int32_t qscale) int32_t qscale)
{ {
@@ -236,7 +236,7 @@ void ff_dct_unquantize_h263_inter_msa(MpegEncContext *s,
h263_dct_unquantize_msa(block, qmul, qadd, nCoeffs, 0); h263_dct_unquantize_msa(block, qmul, qadd, nCoeffs, 0);
} }
void ff_dct_unquantize_mpeg2_inter_msa(MpegEncContext *s, void ff_dct_unquantize_mpeg2_inter_msa(const MPVContext *s,
int16_t *block, int32_t index, int16_t *block, int32_t index,
int32_t qscale) int32_t qscale)
{ {

6
libavcodec/mpeg4videodec.h
View File

@@ -93,11 +93,11 @@ typedef struct Mpeg4DecContext {
Mpeg4VideoDSPContext mdsp; Mpeg4VideoDSPContext mdsp;
void (*dct_unquantize_mpeg2_inter)(MpegEncContext *s, void (*dct_unquantize_mpeg2_inter)(const MPVContext *s,
int16_t *block, int n, int qscale); int16_t *block, int n, int qscale);
void (*dct_unquantize_mpeg2_intra)(MpegEncContext *s, void (*dct_unquantize_mpeg2_intra)(const MPVContext *s,
int16_t *block, int n, int qscale); int16_t *block, int n, int qscale);
void (*dct_unquantize_h263_intra)(MpegEncContext *s, void (*dct_unquantize_h263_intra)(const MPVContext *s,
int16_t *block, int n, int qscale); int16_t *block, int n, int qscale);
union { union {

8
libavcodec/mpegvideo.h
View File

@@ -57,6 +57,8 @@ enum OutputFormat {
FMT_SPEEDHQ, FMT_SPEEDHQ,
}; };
typedef struct MpegEncContext MPVContext;
/** /**
* MpegEncContext. * MpegEncContext.
*/ */
@@ -271,9 +273,9 @@ typedef struct MpegEncContext {
int interlaced_dct; int interlaced_dct;
int first_field; ///< is 1 for the first field of a field picture 0 otherwise int first_field; ///< is 1 for the first field of a field picture 0 otherwise
void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) void (*dct_unquantize_intra)(const MPVContext *s, // unquantizer to use (MPEG-4 can use both)
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) void (*dct_unquantize_inter)(const MPVContext *s, // unquantizer to use (MPEG-4 can use both)
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
/* flag to indicate a reinitialization is required, e.g. after /* flag to indicate a reinitialization is required, e.g. after
@@ -286,8 +288,6 @@ typedef struct MpegEncContext {
ERContext er; ERContext er;
} MpegEncContext; } MpegEncContext;
typedef MpegEncContext MPVContext;
/** /**
* Set the given MpegEncContext to common defaults (same for encoding * Set the given MpegEncContext to common defaults (same for encoding
* and decoding). The changed fields will not depend upon the prior * and decoding). The changed fields will not depend upon the prior

14
libavcodec/mpegvideo_unquantize.c
View File

@@ -33,7 +33,7 @@
#include "mpegvideodata.h" #include "mpegvideodata.h"
#include "mpegvideo_unquantize.h" #include "mpegvideo_unquantize.h"
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, static void dct_unquantize_mpeg1_intra_c(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, nCoeffs; int i, level, nCoeffs;
@@ -62,7 +62,7 @@ static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
} }
} }
static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, static void dct_unquantize_mpeg1_inter_c(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, nCoeffs; int i, level, nCoeffs;
@@ -91,7 +91,7 @@ static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
} }
} }
static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, static void dct_unquantize_mpeg2_intra_c(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, nCoeffs; int i, level, nCoeffs;
@@ -120,7 +120,7 @@ static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
} }
} }
static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s, static void dct_unquantize_mpeg2_intra_bitexact(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, nCoeffs; int i, level, nCoeffs;
@@ -153,7 +153,7 @@ static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
block[63]^=sum&1; block[63]^=sum&1;
} }
static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, static void dct_unquantize_mpeg2_inter_c(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, nCoeffs; int i, level, nCoeffs;
@@ -186,7 +186,7 @@ static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
block[63]^=sum&1; block[63]^=sum&1;
} }
static void dct_unquantize_h263_intra_c(MpegEncContext *s, static void dct_unquantize_h263_intra_c(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, qmul, qadd; int i, level, qmul, qadd;
@@ -220,7 +220,7 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s,
} }
} }
static void dct_unquantize_h263_inter_c(MpegEncContext *s, static void dct_unquantize_h263_inter_c(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, level, qmul, qadd; int i, level, qmul, qadd;

14
libavcodec/mpegvideo_unquantize.h
View File

@@ -29,20 +29,20 @@
#include "config.h" #include "config.h"
typedef struct MpegEncContext MpegEncContext; typedef struct MpegEncContext MPVContext;
typedef struct MPVUnquantDSPContext { typedef struct MPVUnquantDSPContext {
void (*dct_unquantize_mpeg1_intra)(struct MpegEncContext *s, void (*dct_unquantize_mpeg1_intra)(const MPVContext *s,
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_mpeg1_inter)(struct MpegEncContext *s, void (*dct_unquantize_mpeg1_inter)(const MPVContext *s,
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_mpeg2_intra)(struct MpegEncContext *s, void (*dct_unquantize_mpeg2_intra)(const MPVContext *s,
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_mpeg2_inter)(struct MpegEncContext *s, void (*dct_unquantize_mpeg2_inter)(const MPVContext *s,
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_h263_intra)(struct MpegEncContext *s, void (*dct_unquantize_h263_intra)(const MPVContext *s,
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_h263_inter)(struct MpegEncContext *s, void (*dct_unquantize_h263_inter)(const MPVContext *s,
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
} MPVUnquantDSPContext; } MPVUnquantDSPContext;

4
libavcodec/neon/mpegvideo.c
View File

@@ -84,7 +84,7 @@ static void inline ff_dct_unquantize_h263_neon(int qscale, int qadd, int nCoeffs
vst1_s16(block, d0s16); vst1_s16(block, d0s16);
} }
static void dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block, static void dct_unquantize_h263_inter_neon(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
int nCoeffs = s->inter_scantable.raster_end[s->block_last_index[n]]; int nCoeffs = s->inter_scantable.raster_end[s->block_last_index[n]];
@@ -93,7 +93,7 @@ static void dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block,
ff_dct_unquantize_h263_neon(qscale, qadd, nCoeffs + 1, block); ff_dct_unquantize_h263_neon(qscale, qadd, nCoeffs + 1, block);
} }
static void dct_unquantize_h263_intra_neon(MpegEncContext *s, int16_t *block, static void dct_unquantize_h263_intra_neon(const MPVContext *s, int16_t *block,
int n, int qscale) int n, int qscale)
{ {
int qadd; int qadd;

2
libavcodec/ppc/mpegvideo_altivec.c
View File

@@ -40,7 +40,7 @@
/* AltiVec version of dct_unquantize_h263 /* AltiVec version of dct_unquantize_h263
this code assumes `block' is 16 bytes-aligned */ this code assumes `block' is 16 bytes-aligned */
static void dct_unquantize_h263_altivec(MpegEncContext *s, static void dct_unquantize_h263_altivec(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
int i, qmul, qadd; int i, qmul, qadd;

12
libavcodec/x86/mpegvideo.c
View File

@@ -30,7 +30,7 @@
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
static void dct_unquantize_h263_intra_mmx(MpegEncContext *s, static void dct_unquantize_h263_intra_mmx(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
x86_reg level, qmul, qadd, nCoeffs; x86_reg level, qmul, qadd, nCoeffs;
@@ -105,7 +105,7 @@ __asm__ volatile(
} }
static void dct_unquantize_h263_inter_mmx(MpegEncContext *s, static void dct_unquantize_h263_inter_mmx(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
x86_reg qmul, qadd, nCoeffs; x86_reg qmul, qadd, nCoeffs;
@@ -166,7 +166,7 @@ __asm__ volatile(
); );
} }
static void dct_unquantize_mpeg1_intra_mmx(MpegEncContext *s, static void dct_unquantize_mpeg1_intra_mmx(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
x86_reg nCoeffs; x86_reg nCoeffs;
@@ -235,7 +235,7 @@ __asm__ volatile(
block[0]= block0; block[0]= block0;
} }
static void dct_unquantize_mpeg1_inter_mmx(MpegEncContext *s, static void dct_unquantize_mpeg1_inter_mmx(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
x86_reg nCoeffs; x86_reg nCoeffs;
@@ -301,7 +301,7 @@ __asm__ volatile(
); );
} }
static void dct_unquantize_mpeg2_intra_mmx(MpegEncContext *s, static void dct_unquantize_mpeg2_intra_mmx(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
x86_reg nCoeffs; x86_reg nCoeffs;
@@ -369,7 +369,7 @@ __asm__ volatile(
//Note, we do not do mismatch control for intra as errors cannot accumulate //Note, we do not do mismatch control for intra as errors cannot accumulate
} }
static void dct_unquantize_mpeg2_inter_mmx(MpegEncContext *s, static void dct_unquantize_mpeg2_inter_mmx(const MPVContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {
x86_reg nCoeffs; x86_reg nCoeffs;