har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move AMR-WB-specific code to the AMR-WB section of the file.

Browse Source 
Fixes compilation when AMR-NB #includes are not available on the system.

Originally committed as revision 18870 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-05-19 17:31:56 +00:00
parent 4e1424fdc7
commit 6532cd55b1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/libamr.c
View File

@ -57,6 +57,22 @@
#include "avcodec.h" #include "avcodec.h"
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
if (!avctx->sample_rate)
avctx->sample_rate = 8000 * is_amr_wb;
if (!avctx->channels)
avctx->channels = 1;
avctx->frame_size = 160 * is_amr_wb;
avctx->sample_fmt = SAMPLE_FMT_S16;
}
#if CONFIG_LIBAMR_NB
#include <amrnb/interf_dec.h> #include <amrnb/interf_dec.h>
#include <amrnb/interf_enc.h> #include <amrnb/interf_enc.h>
@ -90,22 +106,6 @@ static int getBitrateMode(int bitrate)
return -1; return -1;
} }
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
if (!avctx->sample_rate)
avctx->sample_rate = 8000 * is_amr_wb;
if (!avctx->channels)
avctx->channels = 1;
avctx->frame_size = 160 * is_amr_wb;
avctx->sample_fmt = SAMPLE_FMT_S16;
}
#if CONFIG_LIBAMR_NB
typedef struct AMRContext { typedef struct AMRContext {
int frameCount; int frameCount;
void *decState; void *decState;