Merge "Validation of Number of Channels on WAV files." (8ec6ab3b) · Commits · e / os / android_frameworks_av

media/libstagefright/WAVExtractor.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -193,17 +193,17 @@ status_t WAVExtractor::init() {
		}

		mNumChannels = U16_LE_AT(&formatSpec[2]);
		if (mWaveFormat != WAVE_FORMAT_EXTENSIBLE) {
		if (mNumChannels == 0) {

		if (mNumChannels < 1 \|\| mNumChannels > 8) {
		ALOGE("Unsupported number of channels (%d)", mNumChannels);
		return ERROR_UNSUPPORTED;
		} else if (mNumChannels != 1 && mNumChannels != 2) {
		}

		if (mWaveFormat != WAVE_FORMAT_EXTENSIBLE) {
		if (mNumChannels != 1 && mNumChannels != 2) {
		ALOGW("More than 2 channels (%d) in non-WAVE_EXT, unknown channel mask",
		mNumChannels);
		}
		} else {
		if (mNumChannels < 1 \|\| mNumChannels > 8) {
		return ERROR_UNSUPPORTED;
		}
		}

		mSampleRate = U32_LE_AT(&formatSpec[4]);