diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libm4a/demux.c | 16 | ||||
-rw-r--r-- | apps/codecs/libmusepack/streaminfo.c | 3 |
2 files changed, 6 insertions, 13 deletions
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c index 995dd94a07..7b09074c52 100644 --- a/apps/codecs/libm4a/demux.c +++ b/apps/codecs/libm4a/demux.c | |||
@@ -55,7 +55,6 @@ typedef struct | |||
55 | static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) | 55 | static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) |
56 | { | 56 | { |
57 | fourcc_t type; | 57 | fourcc_t type; |
58 | uint32_t minor_ver; | ||
59 | size_t size_remaining = chunk_len - 8; | 58 | size_t size_remaining = chunk_len - 8; |
60 | 59 | ||
61 | type = stream_read_uint32(qtmovie->stream); | 60 | type = stream_read_uint32(qtmovie->stream); |
@@ -71,7 +70,7 @@ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) | |||
71 | DEBUGF("not M4A file\n"); | 70 | DEBUGF("not M4A file\n"); |
72 | return; | 71 | return; |
73 | } | 72 | } |
74 | minor_ver = stream_read_uint32(qtmovie->stream); | 73 | /* minor_ver = */ stream_read_uint32(qtmovie->stream); |
75 | size_remaining-=4; | 74 | size_remaining-=4; |
76 | 75 | ||
77 | /* compatible brands */ | 76 | /* compatible brands */ |
@@ -104,9 +103,6 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len) | |||
104 | { | 103 | { |
105 | uint8_t tag; | 104 | uint8_t tag; |
106 | uint32_t temp; | 105 | uint32_t temp; |
107 | int audioType; | ||
108 | int32_t maxBitrate; | ||
109 | int32_t avgBitrate; | ||
110 | 106 | ||
111 | (void)chunk_len; | 107 | (void)chunk_len; |
112 | /* version and flags */ | 108 | /* version and flags */ |
@@ -138,12 +134,10 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len) | |||
138 | temp = mp4ff_read_mp4_descr_length(qtmovie->stream); | 134 | temp = mp4ff_read_mp4_descr_length(qtmovie->stream); |
139 | if (temp < 13) return false; | 135 | if (temp < 13) return false; |
140 | 136 | ||
141 | audioType = stream_read_uint8(qtmovie->stream); | 137 | /* audioType = */ stream_read_uint8(qtmovie->stream); |
142 | temp=stream_read_int32(qtmovie->stream);//0x15000414 ???? | 138 | /* temp = */ stream_read_int32(qtmovie->stream);//0x15000414 ???? |
143 | maxBitrate = stream_read_int32(qtmovie->stream); | 139 | /* maxBitrate = */ stream_read_int32(qtmovie->stream); |
144 | avgBitrate = stream_read_int32(qtmovie->stream); | 140 | /* avgBitrate = */ stream_read_int32(qtmovie->stream); |
145 | DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType, | ||
146 | (long)maxBitrate,(long)avgBitrate); | ||
147 | 141 | ||
148 | /* get and verify DecSpecificInfoTag */ | 142 | /* get and verify DecSpecificInfoTag */ |
149 | if (stream_read_uint8(qtmovie->stream) != 0x05) | 143 | if (stream_read_uint8(qtmovie->stream) != 0x05) |
diff --git a/apps/codecs/libmusepack/streaminfo.c b/apps/codecs/libmusepack/streaminfo.c index 2d8ece704a..3303bc4d7d 100644 --- a/apps/codecs/libmusepack/streaminfo.c +++ b/apps/codecs/libmusepack/streaminfo.c | |||
@@ -110,7 +110,6 @@ static mpc_status check_streaminfo(mpc_streaminfo * si) | |||
110 | mpc_status | 110 | mpc_status |
111 | streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r) | 111 | streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r) |
112 | { | 112 | { |
113 | mpc_uint16_t Estimatedpeak_title = 0; | ||
114 | mpc_uint32_t frames, last_frame_samples; | 113 | mpc_uint32_t frames, last_frame_samples; |
115 | 114 | ||
116 | si->bitrate = 0; | 115 | si->bitrate = 0; |
@@ -124,7 +123,7 @@ streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r) | |||
124 | */ | 123 | */ |
125 | mpc_bits_read(r, 2); // Link ? | 124 | mpc_bits_read(r, 2); // Link ? |
126 | si->sample_freq = samplefreqs[mpc_bits_read(r, 2)]; | 125 | si->sample_freq = samplefreqs[mpc_bits_read(r, 2)]; |
127 | Estimatedpeak_title = (mpc_uint16_t) mpc_bits_read(r, 16); // read the ReplayGain data | 126 | mpc_bits_read(r, 16); // Estimatedpeak_title |
128 | si->gain_title = (mpc_uint16_t) mpc_bits_read(r, 16); | 127 | si->gain_title = (mpc_uint16_t) mpc_bits_read(r, 16); |
129 | si->peak_title = (mpc_uint16_t) mpc_bits_read(r, 16); | 128 | si->peak_title = (mpc_uint16_t) mpc_bits_read(r, 16); |
130 | si->gain_album = (mpc_uint16_t) mpc_bits_read(r, 16); | 129 | si->gain_album = (mpc_uint16_t) mpc_bits_read(r, 16); |