generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

g726: split the init function for the encoder and decoder

Browse Source 
This also allows for not having a decoder close function.
This commit is contained in:
Justin Ruggles 2011-10-27 18:13:47 -04:00
parent c8d36d254e
commit d405237bae
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavcodec/g726.c
View File

@ -295,11 +295,10 @@ static int16_t g726_encode(G726Context* c, int16_t sig)
g726_decode(c, i); g726_decode(c, i);
return i; return i;
} }
#endif
/* Interfacing to the libavcodec */ /* Interfacing to the libavcodec */
static av_cold int g726_init(AVCodecContext * avctx) static av_cold int g726_encode_init(AVCodecContext *avctx)
{ {
G726Context* c = avctx->priv_data; G726Context* c = avctx->priv_data;
unsigned int index; unsigned int index;
@ -311,7 +310,7 @@ static av_cold int g726_init(AVCodecContext * avctx)
index = (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2; index = (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
if (avctx->bit_rate % avctx->sample_rate && avctx->codec->encode) { if (avctx->bit_rate % avctx->sample_rate) {
av_log(avctx, AV_LOG_ERROR, "Bitrate - Samplerate combination is invalid\n"); av_log(avctx, AV_LOG_ERROR, "Bitrate - Samplerate combination is invalid\n");
return -1; return -1;
} }
@ -331,24 +330,19 @@ static av_cold int g726_init(AVCodecContext * avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
if (avctx->codec->decode)
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
/* select a frame size that will end on a byte boundary and have a size of /* select a frame size that will end on a byte boundary and have a size of
approximately 1024 bytes */ approximately 1024 bytes */
if (avctx->codec->encode) avctx->frame_size = ((int[]){ 4096, 2736, 2048, 1640 })[index];
avctx->frame_size = ((int[]){ 4096, 2736, 2048, 1640 })[index];
return 0; return 0;
} }
static av_cold int g726_close(AVCodecContext *avctx) static av_cold int g726_encode_close(AVCodecContext *avctx)
{ {
av_freep(&avctx->coded_frame); av_freep(&avctx->coded_frame);
return 0; return 0;
} }
#if CONFIG_ADPCM_G726_ENCODER
static int g726_encode_frame(AVCodecContext *avctx, static int g726_encode_frame(AVCodecContext *avctx,
uint8_t *dst, int buf_size, void *data) uint8_t *dst, int buf_size, void *data)
{ {
@ -368,6 +362,34 @@ static int g726_encode_frame(AVCodecContext *avctx,
} }
#endif #endif
static av_cold int g726_decode_init(AVCodecContext *avctx)
{
G726Context* c = avctx->priv_data;
unsigned int index;
if (avctx->sample_rate <= 0) {
av_log(avctx, AV_LOG_ERROR, "Samplerate is invalid\n");
return -1;
}
index = (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
if(avctx->channels != 1){
av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");
return -1;
}
if(index>3){
av_log(avctx, AV_LOG_ERROR, "Unsupported number of bits %d\n", index+2);
return -1;
}
g726_reset(c, index);
c->code_size = index+2;
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
}
static int g726_decode_frame(AVCodecContext *avctx, static int g726_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
AVPacket *avpkt) AVPacket *avpkt)
@ -404,9 +426,9 @@ AVCodec ff_adpcm_g726_encoder = {
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_ADPCM_G726, .id = CODEC_ID_ADPCM_G726,
.priv_data_size = sizeof(G726Context), .priv_data_size = sizeof(G726Context),
.init = g726_init, .init = g726_encode_init,
.encode = g726_encode_frame, .encode = g726_encode_frame,
.close = g726_close, .close = g726_encode_close,
.capabilities = CODEC_CAP_SMALL_LAST_FRAME, .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
@ -418,8 +440,7 @@ AVCodec ff_adpcm_g726_decoder = {
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_ADPCM_G726, .id = CODEC_ID_ADPCM_G726,
.priv_data_size = sizeof(G726Context), .priv_data_size = sizeof(G726Context),
.init = g726_init, .init = g726_decode_init,
.close = g726_close,
.decode = g726_decode_frame, .decode = g726_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
}; };