Skip to content

M
mpd
Commit ef9ef03b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/faad: use MAX_CHANNELS

.. instead of declaring a new constant.
parent ecb67a1e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/decoder/FaadDecoderPlugin.cxx
View file @ ef9ef03b
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#define AAC_MAX_CHANNELS 6
static const unsigned adts_sample_rates[] = static const unsigned adts_sample_rates[] =
{ 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
16000, 12000, 11025, 8000, 7350, 0, 0, 0 16000, 12000, 11025, 8000, 7350, 0, 0, 0
...@@ -310,7 +308,7 @@ faad_get_file_time_float(InputStream &is) ...@@ -310,7 +308,7 @@ faad_get_file_time_float(InputStream &is)
float length; float length;
buffer = decoder_buffer_new(nullptr, is, buffer = decoder_buffer_new(nullptr, is,
FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); FAAD_MIN_STREAMSIZE * MAX_CHANNELS);
length = faad_song_duration(buffer, is); length = faad_song_duration(buffer, is);
if (length < 0) { if (length < 0) {
...@@ -366,7 +364,7 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is) ...@@ -366,7 +364,7 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is)
DecoderBuffer *buffer; DecoderBuffer *buffer;
buffer = decoder_buffer_new(&mpd_decoder, is, buffer = decoder_buffer_new(&mpd_decoder, is,
FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); FAAD_MIN_STREAMSIZE * MAX_CHANNELS);
total_time = faad_song_duration(buffer, is); total_time = faad_song_duration(buffer, is);
/* create the libfaad decoder */ /* create the libfaad decoder */
......
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