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

Commit 720aa282 authored by John Grossman's avatar John Grossman
Browse files

Switch the way we configure for MediaPlayer retransmission. 



This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
with merge conflicts addressed by hand and additional changes made in
response to code review feedback.

Move in the direction of a more publishable API for configuring a
media player for retransmission.  It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://).  There are many
issues with this technique and it was never meant to stand the test of
time.

This CL gets rid of all that.  A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target.  For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player.  When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.

Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98
Signed-off-by: default avatarJohn Grossman <johngro@google.com>
parent d630f593

include/media/IMediaPlayer.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
#include <utils/KeyedVector.h>

#include <system/audio.h>



// Fwd decl to make sure everyone agrees that the scope of struct sockaddr_in is

// global, and not in android::

struct sockaddr_in;



namespace android {



class Parcel;
@@ -59,6 +63,7 @@ public: 
    virtual status_t        attachAuxEffect(int effectId) = 0;

    virtual status_t        setParameter(int key, const Parcel& request) = 0;

    virtual status_t        getParameter(int key, Parcel* reply) = 0;

    virtual status_t        setRetransmitEndpoint(const struct sockaddr_in* endpoint) = 0;



    // Invoke a generic method on the player by using opaque parcels

    // for the request and reply.

include/media/MediaPlayerInterface.h

+12 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ 
#include <media/AudioSystem.h>

#include <media/Metadata.h>



// Fwd decl to make sure everyone agrees that the scope of struct sockaddr_in is

// global, and not in android::

struct sockaddr_in;



namespace android {



class Parcel;
@@ -141,6 +145,14 @@ public: 
    virtual status_t    setParameter(int key, const Parcel &request) = 0;

    virtual status_t    getParameter(int key, Parcel *reply) = 0;



    // Right now, only the AAX TX player supports this functionality.  For now,

    // provide a default implementation which indicates a lack of support for

    // this functionality to make life easier for all of the other media player

    // maintainers out there.

    virtual status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) {

        return INVALID_OPERATION;

    }



    // Invoke a generic method on the player by using opaque parcels

    // for the request and reply.

    //

include/media/mediaplayer.h

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef ANDROID_MEDIAPLAYER_H

#define ANDROID_MEDIAPLAYER_H



#include <arpa/inet.h>



#include <binder/IMemory.h>

#include <media/IMediaPlayerClient.h>

#include <media/IMediaPlayer.h>
@@ -204,6 +206,7 @@ public: 
            status_t        attachAuxEffect(int effectId);

            status_t        setParameter(int key, const Parcel& request);

            status_t        getParameter(int key, Parcel* reply);

            status_t        setRetransmitEndpoint(const char* addrString, uint16_t port);



private:

            void            clear_l();
@@ -212,6 +215,7 @@ private: 
            status_t        getDuration_l(int *msec);

            status_t        attachNewPlayer(const sp<IMediaPlayer>& player);

            status_t        reset_l();

            status_t        doSetRetransmitEndpoint(const sp<IMediaPlayer>& player);



    sp<IMediaPlayer>            mPlayer;

    thread_id_t                 mLockThreadId;
@@ -234,6 +238,8 @@ private: 
    int                         mVideoHeight;

    int                         mAudioSessionId;

    float                       mSendLevel;

    struct sockaddr_in          mRetransmitEndpoint;

    bool                        mRetransmitEndpointValid;

};



}; // namespace android

media/java/android/media/MediaPlayer.java

+47 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.media.AudioManager; 


import java.io.FileDescriptor;

import java.io.IOException;

import java.net.InetSocketAddress;

import java.util.Map;

import java.util.Set;

import java.lang.ref.WeakReference;
@@ -1486,6 +1487,52 @@ public class MediaPlayer 
     */

    public native static int native_pullBatteryData(Parcel reply);



    /**

     * Sets the target UDP re-transmit endpoint for the low level player.

     * Generally, the address portion of the endpoint is an IP multicast

     * address, although a unicast address would be equally valid.  When a valid

     * retransmit endpoint has been set, the media player will not decode and

     * render the media presentation locally.  Instead, the player will attempt

     * to re-multiplex its media data using the Android@Home RTP profile and

     * re-transmit to the target endpoint.  Receiver devices (which may be

     * either the same as the transmitting device or different devices) may

     * instantiate, prepare, and start a receiver player using a setDataSource

     * URL of the form...

     *

     * aahRX://&lt;multicastIP&gt;:&lt;port&gt;

     *

     * to receive, decode and render the re-transmitted content.

     *

     * setRetransmitEndpoint may only be called before setDataSource has been

     * called; while the player is in the Idle state.

     *

     * @param endpoint the address and UDP port of the re-transmission target or

     * null if no re-transmission is to be performed.

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalArgumentException if the retransmit endpoint is supplied,

     * but invalid.

     *

     * {@hide} pending API council

     */

    public void setRetransmitEndpoint(InetSocketAddress endpoint)

            throws IllegalStateException, IllegalArgumentException

    {

        String addrString = null;

        int port = 0;



        if (null != endpoint) {

            addrString = endpoint.getAddress().getHostAddress();

            port = endpoint.getPort();

        }



        int ret = native_setRetransmitEndpoint(addrString, port);

        if (ret != 0) {

            throw new IllegalArgumentException("Illegal re-transmit endpoint; native ret " + ret);

        }

    }



    private native final int native_setRetransmitEndpoint(String addrString, int port);



    @Override

    protected void finalize() { native_finalize(); }

media/jni/android_media_MediaPlayer.cpp

+40 −0
Original line number Diff line number Diff line
@@ -722,6 +722,45 @@ android_media_MediaPlayer_pullBatteryData(JNIEnv *env, jobject thiz, jobject jav 
    return service->pullBatteryData(reply);

}



static jint

android_media_MediaPlayer_setRetransmitEndpoint(JNIEnv *env, jobject thiz,

                                                jstring addrString, jint port) {

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

    if (mp == NULL ) {

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

        return INVALID_OPERATION;

    }



    const char *cAddrString = NULL;



    if (NULL != addrString) {

        cAddrString = env->GetStringUTFChars(addrString, NULL);

        if (cAddrString == NULL) {  // Out of memory

            return NO_MEMORY;

        }

    }

    ALOGV("setRetransmitEndpoint: %s:%d",

            cAddrString ? cAddrString : "(null)", port);



    status_t ret;

    if (cAddrString && (port > 0xFFFF)) {

        ret = BAD_VALUE;

    } else {

        ret = mp->setRetransmitEndpoint(cAddrString,

                static_cast<uint16_t>(port));

    }



    if (NULL != addrString) {

        env->ReleaseStringUTFChars(addrString, cAddrString);

    }



    if (ret == INVALID_OPERATION ) {

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

    }



    return ret;

}



static jboolean

android_media_MediaPlayer_setParameter(JNIEnv *env, jobject thiz, jint key, jobject java_request)

{
@@ -799,6 +838,7 @@ static JNINativeMethod gMethods[] = { 
    {"native_pullBatteryData", "(Landroid/os/Parcel;)I",        (void *)android_media_MediaPlayer_pullBatteryData},

    {"setParameter",        "(ILandroid/os/Parcel;)Z",          (void *)android_media_MediaPlayer_setParameter},

    {"getParameter",        "(ILandroid/os/Parcel;)V",          (void *)android_media_MediaPlayer_getParameter},

    {"native_setRetransmitEndpoint", "(Ljava/lang/String;I)I",  (void *)android_media_MediaPlayer_setRetransmitEndpoint},

};



static const char* const kClassPathName = "android/media/MediaPlayer";