mp4v2: Fix that sampling rate of HE-AAC is shown in half (Fix #2)

k-takata · k-takata · commit 6dfd2510f4cc · 2018-02-26T22:55:59.000+09:00
I'm not sure whether this is a correct fix, though.
diff --git a/src/lib/mp4v2/src/mp4.cpp b/src/lib/mp4v2/src/mp4.cpp
@@ -2331,7 +2331,11 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file
     {
         if (MP4_IS_VALID_FILE_HANDLE(hFile)) {
             try {
-                return ((MP4File*)hFile)->GetTrackTimeScale(trackId);
+                uint32_t timeScale = ((MP4File*)hFile)->GetTrackTimeScale(trackId);
+                if (MP4GetTrackAudioMpeg4Type(hFile, trackId) == MP4_MPEG4_AAC_HE_AUDIO_TYPE) {
+                    timeScale *= 2;
+                }
+                return timeScale;
             }
             catch( Exception* x ) {
                 mp4v2::impl::log.errorf(*x);

Original file line number	Diff line number	Diff line change
`@@ -2331,7 +2331,11 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file`
`2331`	`2331`	`{`
`2332`	`2332`	`if (MP4_IS_VALID_FILE_HANDLE(hFile)) {`
`2333`	`2333`	`try {`
`2334`		`- return ((MP4File*)hFile)->GetTrackTimeScale(trackId);`
	`2334`	`+ uint32_t timeScale = ((MP4File*)hFile)->GetTrackTimeScale(trackId);`
	`2335`	`+ if (MP4GetTrackAudioMpeg4Type(hFile, trackId) == MP4_MPEG4_AAC_HE_AUDIO_TYPE) {`
	`2336`	`+ timeScale *= 2;`
	`2337`	`+ }`
	`2338`	`+ return timeScale;`
`2335`	`2339`	`}`
`2336`	`2340`	`catch( Exception* x ) {`
`2337`	`2341`	`mp4v2::impl::log.errorf(*x);`