RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/aacps: Pass logctx as void* instead of AVCodecContext* 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-24 19:28:36 +02:00
parent 70b5d9c569
commit 8c1e71a811
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/aacps.h
View File

@ -27,7 +27,6 @@
#include "libavutil/mem_internal.h" #include "libavutil/mem_internal.h"
#include "aacpsdsp.h" #include "aacpsdsp.h"
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#define PS_MAX_NUM_ENV 5 #define PS_MAX_NUM_ENV 5
@ -95,7 +94,7 @@ extern const int8_t ff_k_to_i_34[];
void ff_ps_init_common(void); void ff_ps_init_common(void);
void AAC_RENAME(ff_ps_init)(void); void AAC_RENAME(ff_ps_init)(void);
void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps); void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps);
int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb, int ff_ps_read_data(void *logctx, GetBitContext *gb,
PSCommonContext *ps, int bits_left); PSCommonContext *ps, int bits_left);
int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top); int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top);

26
libavcodec/aacps_common.c
View File

@ -67,14 +67,14 @@ static VLC vlc_ps[10];
* Inter-channel Phase Difference/Overall Phase Difference parameters from the \ * Inter-channel Phase Difference/Overall Phase Difference parameters from the \
* bitstream. \ * bitstream. \
* \ * \
* @param avctx contains the current codec context \ * @param logctx a context for logging \
* @param gb pointer to the input bitstream \ * @param gb pointer to the input bitstream \
* @param ps pointer to the Parametric Stereo context \ * @param ps pointer to the Parametric Stereo context \
* @param PAR pointer to the parameter to be read \ * @param PAR pointer to the parameter to be read \
* @param e envelope to decode \ * @param e envelope to decode \
* @param dt 1: time delta-coded, 0: frequency delta-coded \ * @param dt 1: time delta-coded, 0: frequency delta-coded \
*/ \ */ \
static int read_ ## PAR ## _data(AVCodecContext *avctx, GetBitContext *gb, PSCommonContext *ps, \ static int read_ ## PAR ## _data(void *logctx, GetBitContext *gb, PSCommonContext *ps, \
int8_t (*PAR)[PS_MAX_NR_IIDICC], int table_idx, int e, int dt) \ int8_t (*PAR)[PS_MAX_NR_IIDICC], int table_idx, int e, int dt) \
{ \ { \
int b, num = ps->nr_ ## PAR ## _par; \ int b, num = ps->nr_ ## PAR ## _par; \
@ -101,7 +101,7 @@ static int read_ ## PAR ## _data(AVCodecContext *avctx, GetBitContext *gb, PSCom
} \ } \
return 0; \ return 0; \
err: \ err: \
av_log(avctx, AV_LOG_ERROR, "illegal "#PAR"\n"); \ av_log(logctx, AV_LOG_ERROR, "illegal "#PAR"\n"); \
return AVERROR_INVALIDDATA; \ return AVERROR_INVALIDDATA; \
} }
@ -131,7 +131,7 @@ static int ps_read_extension_data(GetBitContext *gb, PSCommonContext *ps,
return get_bits_count(gb) - count; return get_bits_count(gb) - count;
} }
int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host, int ff_ps_read_data(void *logctx, GetBitContext *gb_host,
PSCommonContext *ps, int bits_left) PSCommonContext *ps, int bits_left)
{ {
int e; int e;
@ -146,7 +146,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
if (ps->enable_iid) { if (ps->enable_iid) {
int iid_mode = get_bits(gb, 3); int iid_mode = get_bits(gb, 3);
if (iid_mode > 5) { if (iid_mode > 5) {
av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n", av_log(logctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n",
iid_mode); iid_mode);
goto err; goto err;
} }
@ -158,7 +158,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
if (ps->enable_icc) { if (ps->enable_icc) {
ps->icc_mode = get_bits(gb, 3); ps->icc_mode = get_bits(gb, 3);
if (ps->icc_mode > 5) { if (ps->icc_mode > 5) {
av_log(avctx, AV_LOG_ERROR, "icc_mode %d is reserved.\n", av_log(logctx, AV_LOG_ERROR, "icc_mode %d is reserved.\n",
ps->icc_mode); ps->icc_mode);
goto err; goto err;
} }
@ -176,7 +176,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
for (e = 1; e <= ps->num_env; e++) { for (e = 1; e <= ps->num_env; e++) {
ps->border_position[e] = get_bits(gb, 5); ps->border_position[e] = get_bits(gb, 5);
if (ps->border_position[e] < ps->border_position[e-1]) { if (ps->border_position[e] < ps->border_position[e-1]) {
av_log(avctx, AV_LOG_ERROR, "border_position non monotone.\n"); av_log(logctx, AV_LOG_ERROR, "border_position non monotone.\n");
goto err; goto err;
} }
} }
@ -187,7 +187,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
if (ps->enable_iid) { if (ps->enable_iid) {
for (e = 0; e < ps->num_env; e++) { for (e = 0; e < ps->num_env; e++) {
int dt = get_bits1(gb); int dt = get_bits1(gb);
if (read_iid_data(avctx, gb, ps, ps->iid_par, huff_iid[2*dt+ps->iid_quant], e, dt)) if (read_iid_data(logctx, gb, ps, ps->iid_par, huff_iid[2*dt+ps->iid_quant], e, dt))
goto err; goto err;
} }
} else } else
@ -196,7 +196,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
if (ps->enable_icc) if (ps->enable_icc)
for (e = 0; e < ps->num_env; e++) { for (e = 0; e < ps->num_env; e++) {
int dt = get_bits1(gb); int dt = get_bits1(gb);
if (read_icc_data(avctx, gb, ps, ps->icc_par, dt ? huff_icc_dt : huff_icc_df, e, dt)) if (read_icc_data(logctx, gb, ps, ps->icc_par, dt ? huff_icc_dt : huff_icc_df, e, dt))
goto err; goto err;
} }
else else
@ -213,7 +213,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
cnt -= 2 + ps_read_extension_data(gb, ps, ps_extension_id); cnt -= 2 + ps_read_extension_data(gb, ps, ps_extension_id);
} }
if (cnt < 0) { if (cnt < 0) {
av_log(avctx, AV_LOG_ERROR, "ps extension overflow %d\n", cnt); av_log(logctx, AV_LOG_ERROR, "ps extension overflow %d\n", cnt);
goto err; goto err;
} }
skip_bits(gb, cnt); skip_bits(gb, cnt);
@ -241,7 +241,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
if (ps->enable_iid){ if (ps->enable_iid){
for (b = 0; b < ps->nr_iid_par; b++) { for (b = 0; b < ps->nr_iid_par; b++) {
if (FFABS(ps->iid_par[ps->num_env][b]) > 7 + 8 * ps->iid_quant) { if (FFABS(ps->iid_par[ps->num_env][b]) > 7 + 8 * ps->iid_quant) {
av_log(avctx, AV_LOG_ERROR, "iid_par invalid\n"); av_log(logctx, AV_LOG_ERROR, "iid_par invalid\n");
goto err; goto err;
} }
} }
@ -249,7 +249,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
if (ps->enable_icc){ if (ps->enable_icc){
for (b = 0; b < ps->nr_iid_par; b++) { for (b = 0; b < ps->nr_iid_par; b++) {
if (ps->icc_par[ps->num_env][b] > 7U) { if (ps->icc_par[ps->num_env][b] > 7U) {
av_log(avctx, AV_LOG_ERROR, "icc_par invalid\n"); av_log(logctx, AV_LOG_ERROR, "icc_par invalid\n");
goto err; goto err;
} }
} }
@ -278,7 +278,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host,
skip_bits_long(gb_host, bits_consumed); skip_bits_long(gb_host, bits_consumed);
return bits_consumed; return bits_consumed;
} }
av_log(avctx, AV_LOG_ERROR, "Expected to read %d PS bits actually read %d.\n", bits_left, bits_consumed); av_log(logctx, AV_LOG_ERROR, "Expected to read %d PS bits actually read %d.\n", bits_left, bits_consumed);
err: err:
ps->start = 0; ps->start = 0;
skip_bits_long(gb_host, bits_left); skip_bits_long(gb_host, bits_left);