highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/opus_silk: Use void* instead of AVCodecContext* as logctx

Browse Source 
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2023-09-28 21:37:26 +02:00
parent 12e9c68bbd
commit 40aa451154
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/opus_silk.c
View File

@@ -48,7 +48,7 @@ typedef struct SilkFrame {
} SilkFrame; } SilkFrame;
struct SilkContext { struct SilkContext {
AVCodecContext *avctx; void *logctx;
int output_channels; int output_channels;
int midonly; int midonly;
@@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc,
if (bandwidth > OPUS_BANDWIDTH_WIDEBAND || if (bandwidth > OPUS_BANDWIDTH_WIDEBAND ||
coded_channels > 2 || duration_ms > 60) { coded_channels > 2 || duration_ms > 60) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed " av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed "
"to the SILK decoder.\n"); "to the SILK decoder.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s)
memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights)); memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights));
} }
int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) int ff_silk_init(void *logctx, SilkContext **ps, int output_channels)
{ {
SilkContext *s; SilkContext *s;
if (output_channels != 1 && output_channels != 2) { if (output_channels != 1 && output_channels != 2) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n",
output_channels); output_channels);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels)
if (!s) if (!s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->avctx = avctx; s->logctx = logctx;
s->output_channels = output_channels; s->output_channels = output_channels;
ff_silk_flush(s); ff_silk_flush(s);

3
libavcodec/opus_silk.h
View File

@@ -23,7 +23,6 @@
#ifndef AVCODEC_OPUS_SILK_H #ifndef AVCODEC_OPUS_SILK_H
#define AVCODEC_OPUS_SILK_H #define AVCODEC_OPUS_SILK_H
#include "avcodec.h"
#include "opus.h" #include "opus.h"
#include "opus_rc.h" #include "opus_rc.h"
@@ -32,7 +31,7 @@
typedef struct SilkContext SilkContext; typedef struct SilkContext SilkContext;
int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels); int ff_silk_init(void *logctx, SilkContext **ps, int output_channels);
void ff_silk_free(SilkContext **ps); void ff_silk_free(SilkContext **ps);
void ff_silk_flush(SilkContext *s); void ff_silk_flush(SilkContext *s);