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

move amr parameters adjusting like other codecs

Browse Source 
Originally committed as revision 6071 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-08-24 09:53:53 +00:00
parent 25be48eb48
commit b95319a2f2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/mov.c
View File

@ -978,14 +978,6 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
if (st->codec->bits_per_sample == 8) if (st->codec->bits_per_sample == 8)
st->codec->codec_id = CODEC_ID_PCM_S8; st->codec->codec_id = CODEC_ID_PCM_S8;
break; break;
case CODEC_ID_AMR_WB:
st->codec->sample_rate = 16000; /* should really we ? */
st->codec->channels=1; /* really needed */
break;
case CODEC_ID_AMR_NB:
st->codec->sample_rate = 8000; /* should really we ? */
st->codec->channels=1; /* really needed */
break;
default: default:
break; break;
} }
@ -1064,6 +1056,15 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->codec_id = CODEC_ID_PCM_S16LE; st->codec->codec_id = CODEC_ID_PCM_S16LE;
break; break;
#endif #endif
/* no ifdef since parameters are always those */
case CODEC_ID_AMR_WB:
st->codec->sample_rate= 16000;
st->codec->channels= 1; /* really needed */
break;
case CODEC_ID_AMR_NB:
st->codec->sample_rate= 8000;
st->codec->channels= 1; /* really needed */
break;
default: default:
break; break;
} }