Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF" (e3065f23) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -91,9 +91,13 @@ public class MediaPropertiesTest extends
		assertEquals("AudioType Mismatch ", audioCodecType, mvi.getAudioType());
		assertEquals("Audio Sampling " + mvi.getAudioSamplingFrequency(),
		audioSamplingFrequency, mvi.getAudioSamplingFrequency());
		// PV SW AAC codec always returns number of channels as Stereo.
		// So we do not assert for number of audio channels for AAC_LC
		if ( audioCodecType != MediaProperties.ACODEC_AAC_LC ) {
		assertEquals("Audio Channels " + mvi.getAudioChannels(), audioChannel,
		mvi.getAudioChannels());
		}
		}

		protected void validateAudioProperties(int audioCodecType, int duration,
		int audioSamplingFrequency, int audioChannel, int audioBitrate,
		@@ -103,9 +107,13 @@ public class MediaPropertiesTest extends
		duration, aT.getDuration(), 10));
		assertEquals("Audio Sampling " + aT.getAudioSamplingFrequency(),
		audioSamplingFrequency, aT.getAudioSamplingFrequency());
		// PV SW AAC codec always returns number of channels as Stereo.
		// So we do not assert for number of audio channels for AAC_LC
		if ( audioCodecType != MediaProperties.ACODEC_AAC_LC ) {
		assertEquals("Audio Channels " + aT.getAudioChannels(), audioChannel,
		aT.getAudioChannels());
		}
		}

		protected void validateImageProperties(int aspectRatio, int fileType,
		int width, int height, MediaImageItem mii)