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

Commit 1d477c53 authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Merge "Require INTERNET permission for network-based content. Bug #1870981"

parents ee5e77ca fc301b0b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10668,7 +10668,7 @@ package android.media { 
    method public void setAuxEffectSendLevel(float);

    method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

    method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

    method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

    method public void setDataSource(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDisplay(android.view.SurfaceHolder);

cmds/stagefright/stream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -357,9 +357,9 @@ int main(int argc, char **argv) { 
    }



    sp<IMediaPlayer> player =

        service->create(getpid(), client, source, 0);

        service->create(getpid(), client, 0);



    if (player != NULL) {

    if (player != NULL && player->setDataSource(source) == NO_ERROR) {

        player->setVideoSurface(surface);

        player->start();

include/media/IMediaPlayer.h

+6 −0
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ 
#include <utils/RefBase.h>

#include <binder/IInterface.h>

#include <binder/Parcel.h>

#include <utils/KeyedVector.h>



namespace android {



class Parcel;

class Surface;

class IStreamSource;

class ISurfaceTexture;



class IMediaPlayer: public IInterface
@@ -34,6 +36,10 @@ public: 


    virtual void            disconnect() = 0;



    virtual status_t        setDataSource(const char *url,

                                    const KeyedVector<String8, String8>* headers) = 0;

    virtual status_t        setDataSource(int fd, int64_t offset, int64_t length) = 0;

    virtual status_t        setDataSource(const sp<IStreamSource>& source) = 0;

    virtual status_t        setVideoSurface(const sp<Surface>& surface) = 0;

    virtual status_t        setVideoSurfaceTexture(

                                    const sp<ISurfaceTexture>& surfaceTexture) = 0;

include/media/IMediaPlayerService.h

+2 −10
Original line number Diff line number Diff line
@@ -41,15 +41,7 @@ public: 


    virtual sp<IMediaRecorder> createMediaRecorder(pid_t pid) = 0;

    virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0;

    virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client,

            const char* url, const KeyedVector<String8, String8> *headers = NULL,

            int audioSessionId = 0) = 0;

    virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client,

            int fd, int64_t offset, int64_t length, int audioSessionId) = 0;



    virtual sp<IMediaPlayer> create(

            pid_t pid, const sp<IMediaPlayerClient> &client,

            const sp<IStreamSource> &source, int audioSessionId) = 0;

    virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0;



    virtual sp<IMemory>         decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;

    virtual sp<IMemory>         decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;

include/media/mediaplayer.h

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <media/IMediaPlayerClient.h>

#include <media/IMediaPlayer.h>

#include <media/IMediaDeathNotifier.h>

#include <media/IStreamSource.h>



#include <utils/KeyedVector.h>

#include <utils/String8.h>
@@ -168,6 +169,7 @@ public: 
                    const KeyedVector<String8, String8> *headers);



            status_t        setDataSource(int fd, int64_t offset, int64_t length);

            status_t        setDataSource(const sp<IStreamSource> &source);

            status_t        setVideoSurface(const sp<Surface>& surface);

            status_t        setVideoSurfaceTexture(

                                    const sp<ISurfaceTexture>& surfaceTexture);
@@ -206,7 +208,7 @@ private: 
            status_t        seekTo_l(int msec);

            status_t        prepareAsync_l();

            status_t        getDuration_l(int *msec);

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

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

            void            disconnectNativeWindow();

            status_t        reset_l();