Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

libspeex: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
release/5.1
Anton Khirnov 6 years ago committed by James Almer
parent ffdf7269a5
commit 97d9a32938
2 changed files with 25 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      libavcodec/libspeexdec.c
  2. 23
      libavcodec/libspeexenc.c

19
libavcodec/libspeexdec.c
Unescape View File

@ -42,7 +42,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
LibSpeexContext *s = avctx->priv_data; LibSpeexContext *s = avctx->priv_data;
const SpeexMode *mode; const SpeexMode *mode;
SpeexHeader *header = NULL; SpeexHeader *header = NULL;
int spx_mode; int spx_mode, channels;
if (avctx->extradata && avctx->extradata_size >= 80) { if (avctx->extradata && avctx->extradata_size >= 80) {
header = speex_packet_to_header(avctx->extradata, header = speex_packet_to_header(avctx->extradata,
@ -68,7 +68,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
spx_mode = 0; spx_mode = 0;
} else if (header) { } else if (header) {
avctx->sample_rate = header->rate; avctx->sample_rate = header->rate;
avctx->channels = header->nb_channels; channels = header->nb_channels;
spx_mode = header->mode; spx_mode = header->mode;
speex_header_free(header); speex_header_free(header);
} else { } else {
@ -94,14 +94,15 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
if (!avctx->sample_rate) if (!avctx->sample_rate)
avctx->sample_rate = 8000 << spx_mode; avctx->sample_rate = 8000 << spx_mode;
if (avctx->channels < 1 || avctx->channels > 2) { if (channels < 1 || channels > 2) {
/* libspeex can handle mono or stereo if initialized as stereo */ /* libspeex can handle mono or stereo if initialized as stereo */
av_log(avctx, AV_LOG_ERROR, "Invalid channel count: %d.\n" av_log(avctx, AV_LOG_ERROR, "Invalid channel count: %d.\n"
"Decoding as stereo.\n", avctx->channels); "Decoding as stereo.\n", channels);
avctx->channels = 2; channels = 2;
} }
avctx->channel_layout = avctx->channels == 2 ? AV_CH_LAYOUT_STEREO : av_channel_layout_uninit(&avctx->ch_layout);
AV_CH_LAYOUT_MONO; avctx->ch_layout = channels == 2 ? (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO :
(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
speex_bits_init(&s->bits); speex_bits_init(&s->bits);
s->dec_state = speex_decoder_init(mode); s->dec_state = speex_decoder_init(mode);
@ -110,7 +111,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
return -1; return -1;
} }
if (avctx->channels == 2) { if (channels == 2) {
SpeexCallback callback; SpeexCallback callback;
callback.callback_id = SPEEX_INBAND_STEREO; callback.callback_id = SPEEX_INBAND_STEREO;
callback.func = speex_std_stereo_request_handler; callback.func = speex_std_stereo_request_handler;
@ -163,7 +164,7 @@ static int libspeex_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "Error decoding Speex frame.\n"); av_log(avctx, AV_LOG_ERROR, "Error decoding Speex frame.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (avctx->channels == 2) if (avctx->ch_layout.nb_channels == 2)
speex_decode_stereo_int(output, s->frame_size, &s->stereo); speex_decode_stereo_int(output, s->frame_size, &s->stereo);
*got_frame_ptr = 1; *got_frame_ptr = 1;

23
libavcodec/libspeexenc.c
Unescape View File

@ -28,8 +28,8 @@
* order to control various encoding parameters. * order to control various encoding parameters.
* *
* Channels * Channels
* Speex only supports mono or stereo, so avctx->channels must be set to * Speex only supports mono or stereo, so avctx->ch_layout.nb_channels must
* 1 or 2. * be set to 1 or 2.
* *
* Sample Rate / Encoding Mode * Sample Rate / Encoding Mode
* Speex has 3 modes, each of which uses a specific sample rate. * Speex has 3 modes, each of which uses a specific sample rate.
@ -114,7 +114,7 @@ static av_cold void print_enc_params(AVCodecContext *avctx,
{ {
const char *mode_str = "unknown"; const char *mode_str = "unknown";
av_log(avctx, AV_LOG_DEBUG, "channels: %d\n", avctx->channels); av_log(avctx, AV_LOG_DEBUG, "channels: %d\n", avctx->ch_layout.nb_channels);
switch (s->header.mode) { switch (s->header.mode) {
case SPEEX_MODEID_NB: mode_str = "narrowband"; break; case SPEEX_MODEID_NB: mode_str = "narrowband"; break;
case SPEEX_MODEID_WB: mode_str = "wideband"; break; case SPEEX_MODEID_WB: mode_str = "wideband"; break;
@ -146,15 +146,16 @@ static av_cold void print_enc_params(AVCodecContext *avctx,
static av_cold int encode_init(AVCodecContext *avctx) static av_cold int encode_init(AVCodecContext *avctx)
{ {
LibSpeexEncContext *s = avctx->priv_data; LibSpeexEncContext *s = avctx->priv_data;
int channels = avctx->ch_layout.nb_channels;
const SpeexMode *mode; const SpeexMode *mode;
uint8_t *header_data; uint8_t *header_data;
int header_size; int header_size;
int32_t complexity; int32_t complexity;
/* channels */ /* channels */
if (avctx->channels < 1 || avctx->channels > 2) { if (channels < 1 || channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Invalid channels (%d). Only stereo and " av_log(avctx, AV_LOG_ERROR, "Invalid channels (%d). Only stereo and "
"mono are supported\n", avctx->channels); "mono are supported\n", channels);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -175,7 +176,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Error initializing libspeex\n"); av_log(avctx, AV_LOG_ERROR, "Error initializing libspeex\n");
return -1; return -1;
} }
speex_init_header(&s->header, avctx->sample_rate, avctx->channels, mode); speex_init_header(&s->header, avctx->sample_rate, channels, mode);
/* rate control method and parameters */ /* rate control method and parameters */
if (avctx->flags & AV_CODEC_FLAG_QSCALE) { if (avctx->flags & AV_CODEC_FLAG_QSCALE) {
@ -210,7 +211,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
} }
/* stereo side information adds about 800 bps to the base bitrate */ /* stereo side information adds about 800 bps to the base bitrate */
/* TODO: this should be calculated exactly */ /* TODO: this should be calculated exactly */
avctx->bit_rate = s->header.bitrate + (avctx->channels == 2 ? 800 : 0); avctx->bit_rate = s->header.bitrate + (channels == 2 ? 800 : 0);
} }
/* VAD is activated with VBR or can be turned on by itself */ /* VAD is activated with VBR or can be turned on by itself */
@ -275,7 +276,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
if (samples) { if (samples) {
/* encode Speex frame */ /* encode Speex frame */
if (avctx->channels == 2) if (avctx->ch_layout.nb_channels == 2)
speex_encode_stereo_int(samples, s->header.frame_size, &s->bits); speex_encode_stereo_int(samples, s->header.frame_size, &s->bits);
speex_encode_int(s->enc_state, samples, &s->bits); speex_encode_int(s->enc_state, samples, &s->bits);
s->pkt_frame_count++; s->pkt_frame_count++;
@ -359,9 +360,15 @@ const AVCodec ff_libspeex_encoder = {
.capabilities = AV_CODEC_CAP_DELAY, .capabilities = AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
#if FF_API_OLD_CHANNEL_LAYOUT
.channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO,
AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO,
0 }, 0 },
#endif
.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO,
AV_CHANNEL_LAYOUT_STEREO,
{ 0 },
},
.supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 }, .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 },
.priv_class = &speex_class, .priv_class = &speex_class,
.defaults = defaults, .defaults = defaults,

Write Preview
Loading…
Cancel
Save