Merge pull request #5831 from raven02/patch-10

Use ctx->mp3Channels instead of setting frame.channel in case of FF inco...
hrydgard · Apr 10, 2014 · b262794 · b262794
2 parents a402fc9 + c711f76
commit b262794
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp
@@ -243,11 +243,8 @@ int sceMp3Decode(u32 mp3, u32 outPcmPtr) {
 		fclose(file);
 	}
 	#endif
-	// 2 bytes per channel and we have frame.channels in mp3 source
-	// learn japanese v0.9 frame.channels = 0
-	if (frame.channels == 0)
-		frame.channels = 2;
-	ctx->mp3SumDecodedSamples += bytesdecoded / (2 * frame.channels);
+	// 2 bytes per channel and we use ctx->mp3Channels here 
+	ctx->mp3SumDecodedSamples += bytesdecoded / (2 * ctx->mp3Channels);
 
 	return bytesdecoded;
 }