Commit 45a97d30 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

set channels and sample rate from mpeg4audio config

Originally committed as revision 12964 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4afaffca
...@@ -313,7 +313,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o ...@@ -313,7 +313,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o
OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o
OBJS-$(CONFIG_OGG_MUXER) += xiph.o OBJS-$(CONFIG_OGG_MUXER) += xiph.o
OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
# external codec libraries # external codec libraries
OBJS-$(CONFIG_LIBA52) += liba52.o OBJS-$(CONFIG_LIBA52) += liba52.o
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "isom.h" #include "isom.h"
#include "dv.h" #include "dv.h"
#include "mpeg4audio.h" #include "mpeg4audio.h"
#include "mpegaudiodata.h"
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
...@@ -407,6 +408,17 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -407,6 +408,17 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
MPEG4AudioConfig cfg; MPEG4AudioConfig cfg;
ff_mpeg4audio_get_config(&cfg, st->codec->extradata, ff_mpeg4audio_get_config(&cfg, st->codec->extradata,
st->codec->extradata_size); st->codec->extradata_size);
if (!cfg.chan_config || cfg.chan_config > 7)
return -1;
st->codec->channels = ff_mpeg4audio_channels[cfg.chan_config];
if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4
st->codec->sample_rate = ff_mpa_freq_tab[cfg.sampling_index];
else
st->codec->sample_rate = cfg.sample_rate; // ext sample rate ?
dprintf(c->fc, "mp4a config channels %d obj %d ext obj %d "
"sample rate %d ext sample rate %d\n", st->codec->channels,
cfg.object_type, cfg.ext_object_type,
cfg.sample_rate, cfg.ext_sample_rate);
if (!(st->codec->codec_id = codec_get_id(mp4_audio_types, if (!(st->codec->codec_id = codec_get_id(mp4_audio_types,
cfg.object_type))) cfg.object_type)))
st->codec->codec_id = CODEC_ID_AAC; st->codec->codec_id = CODEC_ID_AAC;
...@@ -1296,13 +1308,9 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -1296,13 +1308,9 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->width= 0; /* let decoder init width/height */ st->codec->width= 0; /* let decoder init width/height */
st->codec->height= 0; st->codec->height= 0;
break; break;
#ifdef CONFIG_LIBFAAD
case CODEC_ID_AAC:
#endif
#ifdef CONFIG_VORBIS_DECODER #ifdef CONFIG_VORBIS_DECODER
case CODEC_ID_VORBIS: case CODEC_ID_VORBIS:
#endif #endif
case CODEC_ID_MP3ON4:
st->codec->sample_rate= 0; /* let decoder init parameters properly */ st->codec->sample_rate= 0; /* let decoder init parameters properly */
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment