Merge "Remove callback test"
diff --git a/tests/tests/media/libmediandkjni/native-media-jni.cpp b/tests/tests/media/libmediandkjni/native-media-jni.cpp
index abc73ae..9adc887 100644
--- a/tests/tests/media/libmediandkjni/native-media-jni.cpp
+++ b/tests/tests/media/libmediandkjni/native-media-jni.cpp
@@ -573,119 +573,6 @@
return true;
}
-void callback(AMediaCodec *codec, void *userdata) {
- sem_t *sem = (sem_t*) userdata;
- sem_post(sem);
-}
-
-extern "C" jboolean Java_android_media_cts_NativeDecoderTest_testPlaybackWithCallbackNative(
- JNIEnv *env,
- jclass /*clazz*/,
- jobject surface,
- int fd, jlong offset, jlong size) {
-
- ANativeWindow *window = ANativeWindow_fromSurface(env, surface);
- ALOGI("@@@@ native window: %p", window);
-
- AMediaExtractor *ex = AMediaExtractor_new();
- int err = AMediaExtractor_setDataSourceFd(ex, fd, offset, size);
- if (err != 0) {
- ALOGE("setDataSource error: %d", err);
- return false;
- }
-
- int numtracks = AMediaExtractor_getTrackCount(ex);
-
- sem_t sem;
- sem_init(&sem, 0, 0);
-
- AMediaCodec *codec = NULL;
- AMediaFormat *format = NULL;
- bool sawInputEOS = false;
- bool sawOutputEOS = false;
-
- ALOGV("input has %d tracks", numtracks);
- for (int i = 0; i < numtracks; i++) {
- AMediaFormat *format = AMediaExtractor_getTrackFormat(ex, i);
- const char *s = AMediaFormat_toString(format);
- ALOGI("track %d format: %s", i, s);
- const char *mime;
- if (!AMediaFormat_getString(format, AMEDIAFORMAT_KEY_MIME, &mime)) {
- ALOGE("no mime type");
- return false;
- } else if (!strncmp(mime, "video/", 6)) {
- codec = AMediaCodec_createDecoderByType(mime);
- AMediaCodec_configure(codec, format, window, NULL, 0);
- AMediaCodec_setNotificationCallback(codec, callback, &sem);
- AMediaCodec_start(codec);
- AMediaExtractor_selectTrack(ex, i);
- }
- AMediaFormat_delete(format);
- }
-
- while (!sawOutputEOS) {
- // the callback will signal when a buffer is available
- if (sem_wait(&sem)) {
- ALOGI("sem_wait was interrupted");
- continue;
- }
- bool didwork = false;
- ssize_t bufidx = AMediaCodec_dequeueInputBuffer(codec, 0);
- ALOGV("input buffer %d", bufidx);
- if (bufidx >= 0) {
- didwork = true;
- size_t bufsize;
- uint8_t *buf = AMediaCodec_getInputBuffer(codec, bufidx, &bufsize);
- int sampleSize = AMediaExtractor_readSampleData(ex, buf, bufsize);
- ALOGV("read %d", sampleSize);
- if (sampleSize < 0) {
- sampleSize = 0;
- sawInputEOS = true;
- ALOGV("EOS");
- }
- int64_t presentationTimeUs = AMediaExtractor_getSampletime(ex);
-
- AMediaCodec_queueInputBuffer(codec, bufidx, 0, sampleSize, presentationTimeUs,
- sawInputEOS ? AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM : 0);
- AMediaExtractor_advance(ex);
- }
-
- AMediaCodecBufferInfo info;
- int status = AMediaCodec_dequeueOutputBuffer(codec, &info, 0);
- ALOGV("dequeueoutput returned: %d", status);
- if (status >= 0) {
- didwork = true;
- if (info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) {
- ALOGV("output EOS");
- sawOutputEOS = true;
- }
- ALOGV("got decoded buffer size %d", info.size);
- AMediaCodec_releaseOutputBuffer(codec, status, true);
- usleep(20000);
- } else if (status == AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED) {
- didwork = true;
- ALOGV("output buffers changed");
- } else if (status == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) {
- didwork = true;
- format = AMediaCodec_getOutputFormat(codec);
- ALOGV("format changed to: %s", AMediaFormat_toString(format));
- } else if (status == AMEDIACODEC_INFO_TRY_AGAIN_LATER) {
- ALOGV("no output buffer right now");
- } else {
- ALOGV("unexpected info code: %d", status);
- }
-
- if (!didwork) {
- ALOGE("called back for no reason");
- }
- }
-
- sem_destroy(&sem);
- AMediaCodec_stop(codec);
- AMediaCodec_delete(codec);
- AMediaExtractor_delete(ex);
- return true;
-}
extern "C" jboolean Java_android_media_cts_NativeDecoderTest_testPsshNative(JNIEnv * /*env*/,
jclass /*clazz*/, int fd, jlong offset, jlong size) {
diff --git a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
index 2b255dd..fc27dfa 100644
--- a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
@@ -453,25 +453,6 @@
private static native boolean testFormatNative();
- public void testVideoPlaybackWithCallback() throws Exception {
- testVideoPlaybackWithCallback(R.raw.video_1280x720_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz);
- testVideoPlaybackWithCallback(R.raw.video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz);
- testVideoPlaybackWithCallback(R.raw.video_1280x720_webm_vp9_309kbps_25fps_vorbis_stereo_128kbps_44100hz);
- testVideoPlaybackWithCallback(R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz);
- testVideoPlaybackWithCallback(R.raw.video_480x360_mp4_mpeg4_860kbps_25fps_aac_stereo_128kbps_44100hz);
- }
-
- private void testVideoPlaybackWithCallback(int res) throws Exception {
- AssetFileDescriptor fd = mResources.openRawResourceFd(res);
-
- boolean ret = testPlaybackWithCallbackNative(mActivity.getSurfaceHolder().getSurface(),
- fd.getParcelFileDescriptor().getFd(), fd.getStartOffset(), fd.getLength());
- assertTrue("native playback error", ret);
- }
-
- private static native boolean testPlaybackWithCallbackNative(Surface surface,
- int fd, long startOffset, long length);
-
public void testPssh() throws Exception {
testPssh(R.raw.psshtest);
}
