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

Commit 2fd75f35 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "API Extension: Support for optionally specifying a map of extra request... 

Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played."
parents 57853a8a 25643009

camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void CameraService::decUsers() { 
static sp<MediaPlayer> newMediaPlayer(const char *file)

{

    sp<MediaPlayer> mp = new MediaPlayer();

    if (mp->setDataSource(file) == NO_ERROR) {

    if (mp->setDataSource(file, NULL /* headers */) == NO_ERROR) {

        mp->setAudioStreamType(AudioSystem::ENFORCED_AUDIBLE);

        mp->prepare();

    } else {

core/java/android/webkit/HTML5VideoViewProxy.java

+11 −1
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ class HTML5VideoViewProxy extends Handler 
    private static final int ENDED             = 201;

    private static final int POSTER_FETCHED    = 202;



    private static final String COOKIE = "Cookie";



    // Timer thread -> UI thread

    private static final int TIMEUPDATE = 300;
@@ -165,7 +167,15 @@ class HTML5VideoViewProxy extends Handler 
            mVideoView = new VideoView(proxy.getContext());

            mVideoView.setWillNotDraw(false);

            mVideoView.setMediaController(new MediaController(proxy.getContext()));

            mVideoView.setVideoURI(Uri.parse(url));



            String cookieValue = CookieManager.getInstance().getCookie(url);

            Map<String, String> headers = null;

            if (cookieValue != null) {

                headers = new HashMap<String, String>();

                headers.put(COOKIE, cookieValue);

            }



            mVideoView.setVideoURI(Uri.parse(url), headers);

            mVideoView.setOnCompletionListener(proxy);

            mVideoView.setOnPreparedListener(proxy);

            mVideoView.setOnErrorListener(proxy);

core/java/android/widget/VideoView.java

+35 −25
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.view.View; 
import android.widget.MediaController.*;



import java.io.IOException;

import java.util.Map;



/**

 * Displays a video file.  The VideoView class
@@ -50,6 +51,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
    private String TAG = "VideoView";

    // settable by the client

    private Uri         mUri;

    private Map<String, String> mHeaders;

    private int         mDuration;



    // all possible internal states
@@ -169,7 +171,15 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
    }



    public void setVideoURI(Uri uri) {

        setVideoURI(uri, null);

    }



    /**

     * @hide

     */

    public void setVideoURI(Uri uri, Map<String, String> headers) {

        mUri = uri;

        mHeaders = headers;

        mSeekWhenPrepared = 0;

        openVideo();

        requestLayout();
@@ -209,7 +219,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
            mMediaPlayer.setOnErrorListener(mErrorListener);

            mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener);

            mCurrentBufferPercentage = 0;

            mMediaPlayer.setDataSource(mContext, mUri);

            mMediaPlayer.setDataSource(mContext, mUri, mHeaders);

            mMediaPlayer.setDisplay(mSurfaceHolder);

            mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);

            mMediaPlayer.setScreenOnWhilePlaying(true);

include/media/IMediaPlayerService.h

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
#define ANDROID_IMEDIAPLAYERSERVICE_H



#include <utils/Errors.h>  // for status_t

#include <utils/KeyedVector.h>

#include <utils/RefBase.h>

#include <utils/String8.h>

#include <binder/IInterface.h>

#include <binder/Parcel.h>
@@ -38,7 +40,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) = 0;

    virtual sp<IMediaPlayer>    create(pid_t pid, const sp<IMediaPlayerClient>& client, const char* url, const KeyedVector<String8, String8> *headers = NULL) = 0;

    virtual sp<IMediaPlayer>    create(pid_t pid, const sp<IMediaPlayerClient>& client, int fd, int64_t offset, int64_t length) = 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/MediaPlayerInterface.h

+8 −2
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ 


#include <sys/types.h>

#include <ui/ISurface.h>

#include <utils/RefBase.h>

#include <utils/Errors.h>

#include <utils/KeyedVector.h>

#include <utils/String8.h>

#include <utils/RefBase.h>



#include <media/mediaplayer.h>

#include <media/AudioSystem.h>
@@ -96,7 +98,11 @@ public: 
    virtual             ~MediaPlayerBase() {}

    virtual status_t    initCheck() = 0;

    virtual bool        hardwareOutput() = 0;

    virtual status_t    setDataSource(const char *url) = 0;



    virtual status_t    setDataSource(

            const char *url,

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



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

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

    virtual status_t    prepare() = 0;