Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b0b1741 authored by Dave Sparks's avatar Dave Sparks
Browse files

Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow 

passing a null surface. The API is now enabled to change the surface while
the video is playing. This could allow orientation changes during playback
or to allow the audio track from a video to play in the background.
NOTE: There are still changes required to pmem driver to allow remapping
shared physical memory into a process in order for this to work. This
change only enables the API to send the appropriate calls when the lower
level code supports it.
parent b0ded43d

media/java/android/media/MediaPlayer.java

+11 −1
Original line number Diff line number Diff line
@@ -469,6 +469,11 @@ public class MediaPlayer 
        native_setup(new WeakReference<MediaPlayer>(this));

    }



    /*

     * Update the MediaPlayer ISurface. Call after updating mSurface.

     */

    private native void _setVideoSurface();

  

    /**

     * Sets the SurfaceHolder to use for displaying the video portion of the media.

     * This call is optional. Not calling it when playing back a video will
@@ -478,7 +483,12 @@ public class MediaPlayer 
     */

    public void setDisplay(SurfaceHolder sh) {

        mSurfaceHolder = sh;

        if (sh != null) {

            mSurface = sh.getSurface();

        } else {

            mSurface = null;

        }

        _setVideoSurface();

        updateSurfaceScreenOn();

    }

media/jni/android_media_MediaPlayer.cpp

+23 −7
Original line number Diff line number Diff line
@@ -198,22 +198,37 @@ android_media_MediaPlayer_setDataSourceFD(JNIEnv *env, jobject thiz, jobject fil 
    process_media_player_call( env, thiz, mp->setDataSource(fd, offset, length), "java/io/IOException", "setDataSourceFD failed." );

}



static void setVideoSurface(const sp<MediaPlayer>& mp, JNIEnv *env, jobject thiz)

{

    jobject surface = env->GetObjectField(thiz, fields.surface);

    if (surface != NULL) {

        const sp<Surface>& native_surface = get_surface(env, surface);

        LOGV("prepare: surface=%p (id=%d)", 

             native_surface.get(), native_surface->ID());

        mp->setVideoSurface(native_surface);

    }

}



static void

android_media_MediaPlayer_prepare(JNIEnv *env, jobject thiz)

android_media_MediaPlayer_setVideoSurface(JNIEnv *env, jobject thiz)

{

    sp<MediaPlayer> mp = getMediaPlayer(env, thiz);

    if (mp == NULL ) {

        jniThrowException(env, "java/lang/IllegalStateException", NULL);

        return;

    }

    jobject surface = env->GetObjectField(thiz, fields.surface);

    if (surface != NULL) {

        const sp<Surface>& native_surface = get_surface(env, surface);

        LOGV("prepare: surface=%p (id=%d)", 

             native_surface.get(), native_surface->ID());

        mp->setVideoSurface(native_surface);

    setVideoSurface(mp, env, thiz);

}



static void

android_media_MediaPlayer_prepare(JNIEnv *env, jobject thiz)

{

    sp<MediaPlayer> mp = getMediaPlayer(env, thiz);

    if (mp == NULL ) {

        jniThrowException(env, "java/lang/IllegalStateException", NULL);

        return;

    }

    setVideoSurface(mp, env, thiz);

    process_media_player_call( env, thiz, mp->prepare(), "java/io/IOException", "Prepare failed." );

}
@@ -469,6 +484,7 @@ android_media_MediaPlayer_native_finalize(JNIEnv *env, jobject thiz) 
static JNINativeMethod gMethods[] = {

    {"setDataSource",       "(Ljava/lang/String;)V",            (void *)android_media_MediaPlayer_setDataSource},

    {"setDataSource",       "(Ljava/io/FileDescriptor;JJ)V",    (void *)android_media_MediaPlayer_setDataSourceFD},

    {"_setVideoSurface",    "()V",                              (void *)android_media_MediaPlayer_setVideoSurface},

    {"prepare",             "()V",                              (void *)android_media_MediaPlayer_prepare},

    {"prepareAsync",        "()V",                              (void *)android_media_MediaPlayer_prepareAsync},

    {"_start",              "()V",                              (void *)android_media_MediaPlayer_start},