diff options
author | Rajneesh Chowdury <rajneeshc@google.com> | 2011-07-15 16:08:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-15 16:08:01 -0700 |
commit | e3065f23a25b778c9fc718f01def2e1cb264aef8 (patch) | |
tree | 11247c88f693d72e8549b7cf76641db0299c2023 /media/tests/MediaFrameworkTest | |
parent | 849a147c99c35ac03a9d386c837a64918cc6a37f (diff) | |
parent | aea7d6cdfbe7e60b5ac4071759c39bfb2b11af3f (diff) | |
download | frameworks_base-e3065f23a25b778c9fc718f01def2e1cb264aef8.zip frameworks_base-e3065f23a25b778c9fc718f01def2e1cb264aef8.tar.gz frameworks_base-e3065f23a25b778c9fc718f01def2e1cb264aef8.tar.bz2 |
Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF"
Diffstat (limited to 'media/tests/MediaFrameworkTest')
-rwxr-xr-x | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java index 59783e5..4d517db 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java @@ -91,8 +91,12 @@ public class MediaPropertiesTest extends assertEquals("AudioType Mismatch ", audioCodecType, mvi.getAudioType()); assertEquals("Audio Sampling " + mvi.getAudioSamplingFrequency(), audioSamplingFrequency, mvi.getAudioSamplingFrequency()); - assertEquals("Audio Channels " + mvi.getAudioChannels(), audioChannel, - mvi.getAudioChannels()); + // 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, @@ -103,8 +107,12 @@ public class MediaPropertiesTest extends duration, aT.getDuration(), 10)); assertEquals("Audio Sampling " + aT.getAudioSamplingFrequency(), audioSamplingFrequency, aT.getAudioSamplingFrequency()); - assertEquals("Audio Channels " + aT.getAudioChannels(), audioChannel, - aT.getAudioChannels()); + // 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, |