Require INTERNET permission for network-based content. (d681bbb1) · Commits · e / os / android_frameworks_av

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();

media/libmedia/IMediaPlayer.cpp

+71 −0

Original line number	Diff line number	Diff line
		@@ -21,14 +21,20 @@
		#include <binder/Parcel.h>

		#include <media/IMediaPlayer.h>
		#include <media/IStreamSource.h>

		#include <surfaceflinger/ISurface.h>
		#include <surfaceflinger/Surface.h>
		#include <gui/ISurfaceTexture.h>
		#include <utils/String8.h>

		namespace android {

		enum {
		DISCONNECT = IBinder::FIRST_CALL_TRANSACTION,
		SET_DATA_SOURCE_URL,
		SET_DATA_SOURCE_FD,
		SET_DATA_SOURCE_STREAM,
		SET_VIDEO_SURFACE,
		PREPARE_ASYNC,
		START,
		@@ -68,6 +74,43 @@ public:
		remote()->transact(DISCONNECT, data, &reply);
		}

		status_t setDataSource(const char* url,
		const KeyedVector<String8, String8>* headers)
		{
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
		data.writeCString(url);
		if (headers == NULL) {
		data.writeInt32(0);
		} else {
		// serialize the headers
		data.writeInt32(headers->size());
		for (size_t i = 0; i < headers->size(); ++i) {
		data.writeString8(headers->keyAt(i));
		data.writeString8(headers->valueAt(i));
		}
		}
		remote()->transact(SET_DATA_SOURCE_URL, data, &reply);
		return reply.readInt32();
		}

		status_t setDataSource(int fd, int64_t offset, int64_t length) {
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
		data.writeFileDescriptor(fd);
		data.writeInt64(offset);
		data.writeInt64(length);
		remote()->transact(SET_DATA_SOURCE_FD, data, &reply);
		return reply.readInt32();
		}

		status_t setDataSource(const sp<IStreamSource> &source) {
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
		data.writeStrongBinder(source->asBinder());
		return reply.readInt32();
		}

		// pass the buffered Surface to the media player service
		status_t setVideoSurface(const sp<Surface>& surface)
		{
		@@ -273,6 +316,34 @@ status_t BnMediaPlayer::onTransact(
		disconnect();
		return NO_ERROR;
		} break;
		case SET_DATA_SOURCE_URL: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);
		const char* url = data.readCString();
		KeyedVector<String8, String8> headers;
		int32_t numHeaders = data.readInt32();
		for (int i = 0; i < numHeaders; ++i) {
		String8 key = data.readString8();
		String8 value = data.readString8();
		headers.add(key, value);
		}
		reply->writeInt32(setDataSource(url, numHeaders > 0 ? &headers : NULL));
		return NO_ERROR;
		} break;
		case SET_DATA_SOURCE_FD: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);
		int fd = data.readFileDescriptor();
		int64_t offset = data.readInt64();
		int64_t length = data.readInt64();
		reply->writeInt32(setDataSource(fd, offset, length));
		return NO_ERROR;
		}
		case SET_DATA_SOURCE_STREAM: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);
		sp<IStreamSource> source =
		interface_cast<IStreamSource>(data.readStrongBinder());
		reply->writeInt32(setDataSource(source));
		return NO_ERROR;
		}
		case SET_VIDEO_SURFACE: {
		CHECK_INTERFACE(IMediaPlayer, data, reply);
		sp<Surface> surface = Surface::readFromParcel(data);