diff --git a/api/current.txt b/api/current.txt index ac623acd11465..77a38592e186b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15370,6 +15370,7 @@ package android.media { method public final void reset(); method public void setCallback(android.media.MediaCodec.Callback, android.os.Handler); method public void setCallback(android.media.MediaCodec.Callback); + method public void setInputSurface(android.view.Surface); method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler); method public final void setParameters(android.os.Bundle); method public void setSurface(android.view.Surface); @@ -15377,7 +15378,6 @@ package android.media { method public final void signalEndOfInputStream(); method public final void start(); method public final void stop(); - method public void usePersistentInputSurface(android.view.Surface); field public static final int BUFFER_FLAG_CODEC_CONFIG = 2; // 0x2 field public static final int BUFFER_FLAG_END_OF_STREAM = 4; // 0x4 field public static final int BUFFER_FLAG_KEY_FRAME = 1; // 0x1 @@ -16226,6 +16226,7 @@ package android.media { method public void setAudioSource(int) throws java.lang.IllegalStateException; method public deprecated void setCamera(android.hardware.Camera); method public void setCaptureRate(double); + method public void setInputSurface(android.view.Surface); method public void setLocation(float, float); method public void setMaxDuration(int) throws java.lang.IllegalArgumentException; method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException; @@ -16244,7 +16245,6 @@ package android.media { method public void setVideoSource(int) throws java.lang.IllegalStateException; method public void start() throws java.lang.IllegalStateException; method public void stop() throws java.lang.IllegalStateException; - method public void usePersistentSurface(android.view.Surface); field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1; // 0x1 field public static final int MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800; // 0x320 diff --git a/api/system-current.txt b/api/system-current.txt index 8ff6f6b6bf3d3..06049f0068616 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16592,6 +16592,7 @@ package android.media { method public final void reset(); method public void setCallback(android.media.MediaCodec.Callback, android.os.Handler); method public void setCallback(android.media.MediaCodec.Callback); + method public void setInputSurface(android.view.Surface); method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler); method public final void setParameters(android.os.Bundle); method public void setSurface(android.view.Surface); @@ -16599,7 +16600,6 @@ package android.media { method public final void signalEndOfInputStream(); method public final void start(); method public final void stop(); - method public void usePersistentInputSurface(android.view.Surface); field public static final int BUFFER_FLAG_CODEC_CONFIG = 2; // 0x2 field public static final int BUFFER_FLAG_END_OF_STREAM = 4; // 0x4 field public static final int BUFFER_FLAG_KEY_FRAME = 1; // 0x1 @@ -17449,6 +17449,7 @@ package android.media { method public void setAudioSource(int) throws java.lang.IllegalStateException; method public deprecated void setCamera(android.hardware.Camera); method public void setCaptureRate(double); + method public void setInputSurface(android.view.Surface); method public void setLocation(float, float); method public void setMaxDuration(int) throws java.lang.IllegalArgumentException; method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException; @@ -17467,7 +17468,6 @@ package android.media { method public void setVideoSource(int) throws java.lang.IllegalStateException; method public void start() throws java.lang.IllegalStateException; method public void stop() throws java.lang.IllegalStateException; - method public void usePersistentSurface(android.view.Surface); field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1; // 0x1 field public static final int MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800; // 0x320 diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 6f7b58348758b..757915d35df50 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -677,7 +677,7 @@ final public class MediaCodec { *

* The application is responsible for calling release() on the Surface when done. * - * @return an input surface that can be used with {@link #usePersistentInputSurface}. + * @return an input surface that can be used with {@link #setInputSurface}. */ @NonNull public static Surface createPersistentInputSurface() { @@ -707,17 +707,17 @@ final public class MediaCodec { * @throws IllegalArgumentException if the surface was not created by * {@link #createPersistentInputSurface}. */ - public void usePersistentInputSurface(@NonNull Surface surface) { + public void setInputSurface(@NonNull Surface surface) { if (!(surface instanceof PersistentSurface)) { throw new IllegalArgumentException("not a PersistentSurface"); } - native_usePersistentInputSurface(surface); + native_setInputSurface(surface); } @NonNull private static native final PersistentSurface native_createPersistentInputSurface(); private static native final void native_releasePersistentInputSurface(@NonNull Surface surface); - private native final void native_usePersistentInputSurface(@NonNull Surface surface); + private native final void native_setInputSurface(@NonNull Surface surface); private native final void native_setCallback(@Nullable Callback cb); diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 206c171cb66a4..9221b3ccb3fe4 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -156,14 +156,14 @@ public class MediaRecorder * @see MediaCodec#createPersistentInputSurface * @see MediaRecorder.VideoSource */ - public void usePersistentSurface(@NonNull Surface surface) { + public void setInputSurface(@NonNull Surface surface) { if (!(surface instanceof MediaCodec.PersistentSurface)) { throw new IllegalArgumentException("not a PersistentSurface"); } - native_usePersistentSurface(surface); + native_setInputSurface(surface); } - private native final void native_usePersistentSurface(@NonNull Surface surface); + private native final void native_setInputSurface(@NonNull Surface surface); /** * Sets a Surface to show a preview of recorded media (video). Calls this diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index f808c0d1cf54a..e0ba0a7ece161 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -272,9 +272,9 @@ status_t JMediaCodec::createInputSurface( return mCodec->createInputSurface(bufferProducer); } -status_t JMediaCodec::usePersistentInputSurface( +status_t JMediaCodec::setInputSurface( const sp &surface) { - return mCodec->usePersistentInputSurface(surface); + return mCodec->setInputSurface(surface); } status_t JMediaCodec::start() { @@ -1024,9 +1024,9 @@ static void android_media_MediaCodec_releasePersistentInputSurface( // no need to release surface as it will be released by Surface's jni } -static void android_media_MediaCodec_usePersistentInputSurface( +static void android_media_MediaCodec_setInputSurface( JNIEnv* env, jobject thiz, jobject object) { - ALOGV("android_media_MediaCodec_usePersistentInputSurface"); + ALOGV("android_media_MediaCodec_setInputSurface"); sp codec = getMediaCodec(env, thiz); if (codec == NULL) { @@ -1037,7 +1037,7 @@ static void android_media_MediaCodec_usePersistentInputSurface( sp persistentSurface = android_media_MediaCodec_getPersistentInputSurface(env, object); - status_t err = codec->usePersistentInputSurface(persistentSurface); + status_t err = codec->setInputSurface(persistentSurface); if (err != NO_ERROR) { throwExceptionAsNecessary(env, err); } @@ -1726,8 +1726,8 @@ static JNINativeMethod gMethods[] = { "()Landroid/media/MediaCodec$PersistentSurface;", (void *)android_media_MediaCodec_createPersistentInputSurface }, - { "native_usePersistentInputSurface", "(Landroid/view/Surface;)V", - (void *)android_media_MediaCodec_usePersistentInputSurface }, + { "native_setInputSurface", "(Landroid/view/Surface;)V", + (void *)android_media_MediaCodec_setInputSurface }, { "native_setCallback", "(Landroid/media/MediaCodec$Callback;)V", diff --git a/media/jni/android_media_MediaCodec.h b/media/jni/android_media_MediaCodec.h index bf61f4269c9f2..a4ed67b4e90c0 100644 --- a/media/jni/android_media_MediaCodec.h +++ b/media/jni/android_media_MediaCodec.h @@ -58,7 +58,7 @@ struct JMediaCodec : public AHandler { const sp &surface); status_t createInputSurface(sp* bufferProducer); - status_t usePersistentInputSurface(const sp &surface); + status_t setInputSurface(const sp &surface); status_t start(); status_t stop(); diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 0044bed183d8d..f60af63306bad 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -496,16 +496,16 @@ android_media_MediaRecorder_native_finalize(JNIEnv *env, jobject thiz) android_media_MediaRecorder_release(env, thiz); } -void android_media_MediaRecorder_usePersistentSurface( +void android_media_MediaRecorder_setInputSurface( JNIEnv* env, jobject thiz, jobject object) { - ALOGV("android_media_MediaRecorder_usePersistentSurface"); + ALOGV("android_media_MediaRecorder_setInputSurface"); sp mr = getMediaRecorder(env, thiz); sp persistentSurface = get_persistentSurface(env, object); - process_media_recorder_call(env, mr->usePersistentSurface(persistentSurface), - "java/lang/IllegalArgumentException", "native_usePersistentSurface failed."); + process_media_recorder_call(env, mr->setInputSurface(persistentSurface), + "java/lang/IllegalArgumentException", "native_setInputSurface failed."); } // ---------------------------------------------------------------------------- @@ -534,7 +534,7 @@ static JNINativeMethod gMethods[] = { {"native_setup", "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V", (void *)android_media_MediaRecorder_native_setup}, {"native_finalize", "()V", (void *)android_media_MediaRecorder_native_finalize}, - {"native_usePersistentSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaRecorder_usePersistentSurface }, + {"native_setInputSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaRecorder_setInputSurface }, }; // This function only registers the native methods, and is called from diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java index 563b0f3e61050..35540e358c8bc 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java @@ -252,7 +252,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2