summaryrefslogtreecommitdiff
path: root/lib/rbcodec/metadata/wave.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rbcodec/metadata/wave.c')
-rw-r--r--lib/rbcodec/metadata/wave.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/rbcodec/metadata/wave.c b/lib/rbcodec/metadata/wave.c
index 3fb051dd3c..2c918d1357 100644
--- a/lib/rbcodec/metadata/wave.c
+++ b/lib/rbcodec/metadata/wave.c
@@ -160,7 +160,7 @@ static void set_totalsamples(struct wave_fmt *fmt, struct mp3entry* id3)
160 fmt->samplesperblock = 1; 160 fmt->samplesperblock = 1;
161 break; 161 break;
162 case WAVE_FORMAT_YAMAHA_ADPCM: 162 case WAVE_FORMAT_YAMAHA_ADPCM:
163 if (id3->channels != 0) 163 if (fmt->channels != 0)
164 { 164 {
165 fmt->samplesperblock = 165 fmt->samplesperblock =
166 (fmt->blockalign == ((id3->frequency / 60) + 4) * fmt->channels)? 166 (fmt->blockalign == ((id3->frequency / 60) + 4) * fmt->channels)?
@@ -172,7 +172,7 @@ static void set_totalsamples(struct wave_fmt *fmt, struct mp3entry* id3)
172 fmt->samplesperblock = 2; 172 fmt->samplesperblock = 2;
173 break; 173 break;
174 case WAVE_FORMAT_SWF_ADPCM: 174 case WAVE_FORMAT_SWF_ADPCM:
175 if (fmt->bitspersample != 0 && id3->channels != 0) 175 if (fmt->bitspersample != 0 && fmt->channels != 0)
176 { 176 {
177 fmt->samplesperblock 177 fmt->samplesperblock
178 = (((fmt->blockalign << 3) - 2) / fmt->channels - 22) 178 = (((fmt->blockalign << 3) - 2) / fmt->channels - 22)
@@ -226,8 +226,6 @@ static void parse_riff_format(unsigned char* buf, int fmtsize, struct wave_fmt *
226 if(id3->bitrate == 66 || id3->bitrate == 94) 226 if(id3->bitrate == 66 || id3->bitrate == 94)
227 jsflag = 1; 227 jsflag = 1;
228 228
229 id3->extradata_size = 14;
230 id3->channels = 2;
231 id3->codectype = AFMT_OMA_ATRAC3; 229 id3->codectype = AFMT_OMA_ATRAC3;
232 id3->bytesperframe = fmt->blockalign; 230 id3->bytesperframe = fmt->blockalign;
233 231