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

Allow bitrates zero and 13200 (needed for decoding mov and aiff)

Browse Source 
Originally committed as revision 12953 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michel Bardiaux 2008-04-25 13:05:15 +00:00
parent 37ffe34bf3
commit 96ddaff5ec
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/libgsm.c
View File

@ -36,8 +36,23 @@
#define GSM_FRAME_SIZE 160 #define GSM_FRAME_SIZE 160
static av_cold int libgsm_init(AVCodecContext *avctx) { static av_cold int libgsm_init(AVCodecContext *avctx) {
if (avctx->channels > 1 || avctx->sample_rate != 8000 || avctx->bit_rate != 13000) if (avctx->channels > 1) {
av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
avctx->channels);
return -1; return -1;
}
if (avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
avctx->sample_rate);
return -1;
}
if (avctx->bit_rate != 13000 /* Official */ &&
avctx->bit_rate != 13200 /* Very common */ &&
avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
avctx->bit_rate);
return -1;
}
avctx->priv_data = gsm_create(); avctx->priv_data = gsm_create();