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

libgsm: convert to new channel layout API 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov 2013-05-07 07:20:32 +02:00 committed by James Almer
parent 06ed1927b1
commit 5359381864
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libgsmdec.c
View File

@ -48,8 +48,8 @@ typedef struct LibGSMDecodeContext {
static av_cold int libgsm_decode_init(AVCodecContext *avctx) { static av_cold int libgsm_decode_init(AVCodecContext *avctx) {
LibGSMDecodeContext *s = avctx->priv_data; LibGSMDecodeContext *s = avctx->priv_data;
avctx->channels = 1; av_channel_layout_uninit(&avctx->ch_layout);
avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
if (!avctx->sample_rate) if (!avctx->sample_rate)
avctx->sample_rate = 8000; avctx->sample_rate = 8000;
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;

12
libavcodec/libgsmenc.c
View File

@ -49,12 +49,6 @@ static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
} }
static av_cold int libgsm_encode_init(AVCodecContext *avctx) { static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
if (avctx->channels > 1) {
av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
avctx->channels);
return -1;
}
if (avctx->sample_rate != 8000) { if (avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n", av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
avctx->sample_rate); avctx->sample_rate);
@ -132,7 +126,10 @@ const AVCodec ff_libgsm_encoder = {
.encode2 = libgsm_encode_frame, .encode2 = libgsm_encode_frame,
.close = libgsm_encode_close, .close = libgsm_encode_close,
.defaults = libgsm_defaults, .defaults = libgsm_defaults,
#if FF_API_OLD_CHANNEL_LAYOUT
.channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, .channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 },
#endif
.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } },
.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 },
.wrapper_name = "libgsm", .wrapper_name = "libgsm",
@ -149,7 +146,10 @@ const AVCodec ff_libgsm_ms_encoder = {
.encode2 = libgsm_encode_frame, .encode2 = libgsm_encode_frame,
.close = libgsm_encode_close, .close = libgsm_encode_close,
.defaults = libgsm_defaults, .defaults = libgsm_defaults,
#if FF_API_OLD_CHANNEL_LAYOUT
.channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, .channel_layouts= (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 },
#endif
.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } },
.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 },
.wrapper_name = "libgsm", .wrapper_name = "libgsm",