oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mp4: initialize audio_format before decoder_initialized()

Browse Source 
Removed the duplicate audio_format initialization.
This commit is contained in:
Max Kellermann 2008-11-04 17:05:05 +01:00
parent 290347c482
commit 11404b5d10
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/decoder/mp4_plugin.c
View File

@ -109,7 +109,6 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
faacDecHandle decoder; faacDecHandle decoder;
faacDecFrameInfo frame_info; faacDecFrameInfo frame_info;
faacDecConfigurationPtr config; faacDecConfigurationPtr config;
struct audio_format audio_format;
unsigned char *mp4_buffer; unsigned char *mp4_buffer;
unsigned int mp4_buffer_size; unsigned int mp4_buffer_size;
uint32_t sample_rate; uint32_t sample_rate;
@ -155,8 +154,6 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
#endif #endif
faacDecSetConfiguration(decoder, config); faacDecSetConfiguration(decoder, config);
audio_format.bits = 16;
mp4_buffer = NULL; mp4_buffer = NULL;
mp4_buffer_size = 0; mp4_buffer_size = 0;
mp4ff_get_decoder_config(mp4fh, track, &mp4_buffer, &mp4_buffer_size); mp4ff_get_decoder_config(mp4fh, track, &mp4_buffer, &mp4_buffer_size);
@ -169,8 +166,6 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
return false; return false;
} }
audio_format.sample_rate = sample_rate;
audio_format.channels = channels;
file_time = mp4ff_get_track_duration_use_offsets(mp4fh, track); file_time = mp4ff_get_track_duration_use_offsets(mp4fh, track);
scale = mp4ff_time_scale(mp4fh, track); scale = mp4ff_time_scale(mp4fh, track);
@ -259,12 +254,16 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
} }
if (!initialized) { if (!initialized) {
struct audio_format audio_format = {
.bits = 16,
.channels = frame_info.channels,
};
channels = frame_info.channels; channels = frame_info.channels;
#ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE #ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
scale = frame_info.samplerate; scale = frame_info.samplerate;
#endif #endif
audio_format.sample_rate = scale; audio_format.sample_rate = scale;
audio_format.channels = frame_info.channels;
decoder_initialized(mpd_decoder, &audio_format, decoder_initialized(mpd_decoder, &audio_format,
input_stream->seekable, input_stream->seekable,
total_time); total_time);