MediaCodec now submits codec specific data automatically
if it's included in the format passed to MediaCodec.configure().
Change-Id: Ia784a7fab5ec0f507d8cd170ef98fd4f109f0f68
related-to-bug: 6364139
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index 8c7158e..45da232 100644
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -114,34 +114,6 @@
codecInputBuffers = codec.getInputBuffers();
codecOutputBuffers = codec.getOutputBuffers();
- // set up codec specific data, if any
- int n = 0;
- while (format.containsKey("csd-" + n)) {
- ByteBuffer srcBuf = format.getByteBuffer("csd-" + n);
-
- // Specifying a timeout of -1 indicates an infinite timeout, i.e.
- // we're going to block until we get a buffer.
- int dstBufIndex = codec.dequeueInputBuffer(-1 /* timeoutUs */);
- ByteBuffer dstBuf = codecInputBuffers[dstBufIndex];
-
- int srcBufLen = srcBuf.limit();
-
- // The clear() calls below do not "clear" anything,
- // they merely reset read/write offsets to 0.
- srcBuf.clear();
- dstBuf.clear();
- dstBuf.put(srcBuf);
-
- codec.queueInputBuffer(
- dstBufIndex,
- 0 /* offset */,
- srcBufLen,
- 0 /* sampleTimeUs */,
- MediaCodec.BUFFER_FLAG_CODEC_CONFIG);
-
- ++n;
- }
-
extractor.selectTrack(0);
// start decoding
