Merge "Parse SBR extension sample rate" into jb-mr2-dev (1cea316d) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+22 −9

Original line number	Diff line number	Diff line
		@@ -2067,6 +2067,19 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
		sampleRate = br.getBits(24);
		numChannels = br.getBits(4);
		} else {
		numChannels = br.getBits(4);
		if (objectType == 5) {
		// SBR specific config per 14496-3 table 1.13
		freqIndex = br.getBits(4);
		if (freqIndex == 15) {
		if (csd_size < 8) {
		return ERROR_MALFORMED;
		}
		sampleRate = br.getBits(24);
		}
		}

		if (sampleRate == 0) {
		static uint32_t kSamplingRate[] = {
		96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
		16000, 12000, 11025, 8000, 7350
		@@ -2077,7 +2090,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
		}

		sampleRate = kSamplingRate[freqIndex];
		numChannels = br.getBits(4);
		}
		}

		if (numChannels == 0) {