commit 84490212625a372bdc3d463ce94f189d76b8997c
author Xinghua Yang <xinghua.yang@mediatek.com> Wed Jul 27 17:05:07 2016 +0800
committer Xinghua Yang <xinghua.yang@mediatek.com> Thu Jul 28 04:26:06 2016 +0000
tree 936a41985c57fa8397ac42e5a7b457e501bc9512
parent 48a835d4b40372ac144a415551da84c50c79cef7

Add frame-rate requirement to MediaFormat used to find matched encoder

Root Cause:
The MediaFormat used to find matched test encoder and to create the test
encoder are different, which leads to the Google h.264 encoder selected
in isConcurrentEncodingDecodingSupported(), but fail to be created in
doEncoding() function due to being unable to meet the required frame
rate. If unable to find an encoder to create, the doEncoding() will
throw exception.

Solution:
Add the frame rate condition to the
isConcurrentEncodingDecodingSupported() function to screen out the
unqualified encoder at first place.

Change-Id: I2f64f744534238637af071922129c0f5684f3bd9
Signed-off-by: Xinghua Yang <xinghua.yang@mediatek.com>

tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java

diff --git a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
index 6a556e3..7df0c31 100644
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
@@ -1372,6 +1372,7 @@
         MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
         MediaFormat testFormat = MediaFormat.createVideoFormat(MIME_TYPE, w, h);
         testFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
+        testFormat.setInteger(MediaFormat.KEY_FRAME_RATE, 30);
         if (mcl.findDecoderForFormat(testFormat) == null
                 || mcl.findEncoderForFormat(testFormat) == null) {
             return false;