diff options
-rw-r--r-- | include/media/IMediaPlayerService.h | 12 | ||||
-rw-r--r-- | include/media/IRemoteDisplay.h | 62 | ||||
-rw-r--r-- | include/media/IRemoteDisplayClient.h | 80 | ||||
-rw-r--r-- | media/libmedia/Android.mk | 2 | ||||
-rw-r--r-- | media/libmedia/IMediaPlayerService.cpp | 26 | ||||
-rw-r--r-- | media/libmedia/IRemoteDisplay.cpp | 63 | ||||
-rw-r--r-- | media/libmedia/IRemoteDisplayClient.cpp | 102 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 8 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 5 |
9 files changed, 359 insertions, 1 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 172975c..c4c37b6 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -34,6 +34,8 @@ namespace android { struct ICrypto; class IMediaRecorder; class IOMX; +class IRemoteDisplay; +class IRemoteDisplayClient; struct IStreamSource; class IMediaPlayerService: public IInterface @@ -50,6 +52,16 @@ public: virtual sp<IOMX> getOMX() = 0; virtual sp<ICrypto> makeCrypto() = 0; + // Connects to a remote display. + // 'iface' specifies the address of the local interface on which to listen for + // a connection from the remote display as an ip address and port number + // of the form "x.x.x.x:y". The media server should call back into the provided remote + // display client when display connection, disconnection or errors occur. + // The assumption is that at most one remote display will be connected to the + // provided interface at a time. + virtual sp<IRemoteDisplay> listenForRemoteDisplay(const sp<IRemoteDisplayClient>& client, + const String8& iface) = 0; + // If iface == NULL, disable remote display, otherwise // iface should be of the form "x.x.x.x:y", i.e. ip address // of the local interface to bind to and the port number diff --git a/include/media/IRemoteDisplay.h b/include/media/IRemoteDisplay.h new file mode 100644 index 0000000..f39286e --- /dev/null +++ b/include/media/IRemoteDisplay.h @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ANDROID_IREMOTEDISPLAY_H +#define ANDROID_IREMOTEDISPLAY_H + +#include <stdint.h> +#include <sys/types.h> + +#include <utils/RefBase.h> +#include <binder/IInterface.h> +#include <binder/Parcel.h> + +namespace android { + +/* + * Represents a remote display, such as a Wifi display. + * + * When the remote display is created, it may not yet be connected to the + * display. The remote display asynchronously reports events such as successful + * connection, disconnection and errors to an IRemoteDisplayClient interface provided by + * the client. + */ +class IRemoteDisplay : public IInterface +{ +public: + DECLARE_META_INTERFACE(RemoteDisplay); + + // Disconnects the remote display. + // The remote display should respond back to the IRemoteDisplayClient with an + // onDisplayDisconnected() event when the disconnection is complete. + virtual status_t disconnect() = 0; +}; + + +// ---------------------------------------------------------------------------- + +class BnRemoteDisplay : public BnInterface<IRemoteDisplay> +{ +public: + virtual status_t onTransact( uint32_t code, + const Parcel& data, + Parcel* reply, + uint32_t flags = 0); +}; + +}; // namespace android + +#endif // ANDROID_IREMOTEDISPLAY_H diff --git a/include/media/IRemoteDisplayClient.h b/include/media/IRemoteDisplayClient.h new file mode 100644 index 0000000..38a0c9a --- /dev/null +++ b/include/media/IRemoteDisplayClient.h @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ANDROID_IREMOTEDISPLAYCLIENT_H +#define ANDROID_IREMOTEDISPLAYCLIENT_H + +#include <stdint.h> +#include <sys/types.h> + +#include <utils/RefBase.h> +#include <binder/IInterface.h> +#include <binder/Parcel.h> + +namespace android { + +class ISurfaceTexture; + +class IRemoteDisplayClient : public IInterface +{ +public: + DECLARE_META_INTERFACE(RemoteDisplayClient); + + enum { + // Flag: The remote display is using a secure transport protocol such as HDCP. + kDisplayFlagSecure = 1 << 0, + }; + + enum { + // Error: An unknown / generic error occurred. + kErrorUnknown = 0, + // Error: The connection was dropped unexpectedly. + kErrorConnectionDropped = 1, + }; + + // Indicates that the remote display has been connected successfully. + // Provides a surface texture that the client should use to stream buffers to + // the remote display. + virtual void onDisplayConnected(const sp<ISurfaceTexture>& surfaceTexture, + uint32_t width, uint32_t height, uint32_t flags) = 0; // one-way + + // Indicates that the remote display has been disconnected normally. + // This method should only be called once the client has called 'disconnect()'. + // It is currently an error for the display to disconnect for any other reason. + virtual void onDisplayDisconnected() = 0; // one-way + + // Indicates that a connection could not be established to the remote display + // or an unrecoverable error occurred and the connection was severed. + // The media server should continue listening for connection attempts from the + // remote display. + virtual void onDisplayError(int32_t error) = 0; // one-way +}; + + +// ---------------------------------------------------------------------------- + +class BnRemoteDisplayClient : public BnInterface<IRemoteDisplayClient> +{ +public: + virtual status_t onTransact( uint32_t code, + const Parcel& data, + Parcel* reply, + uint32_t flags = 0); +}; + +}; // namespace android + +#endif // ANDROID_IREMOTEDISPLAYCLIENT_H diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index bcce063..76308e8 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -27,6 +27,8 @@ LOCAL_SRC_FILES:= \ IMediaRecorderClient.cpp \ IMediaPlayer.cpp \ IMediaRecorder.cpp \ + IRemoteDisplay.cpp \ + IRemoteDisplayClient.cpp \ IStreamSource.cpp \ Metadata.cpp \ mediarecorder.cpp \ diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp index d3e2e19..c2ec439 100644 --- a/media/libmedia/IMediaPlayerService.cpp +++ b/media/libmedia/IMediaPlayerService.cpp @@ -24,9 +24,12 @@ #include <media/IMediaPlayerService.h> #include <media/IMediaRecorder.h> #include <media/IOMX.h> +#include <media/IRemoteDisplay.h> +#include <media/IRemoteDisplayClient.h> #include <media/IStreamSource.h> #include <utils/Errors.h> // for status_t +#include <utils/String8.h> namespace android { @@ -40,7 +43,8 @@ enum { MAKE_CRYPTO, ENABLE_REMOTE_DISPLAY, ADD_BATTERY_DATA, - PULL_BATTERY_DATA + PULL_BATTERY_DATA, + LISTEN_FOR_REMOTE_DISPLAY, }; class BpMediaPlayerService: public BpInterface<IMediaPlayerService> @@ -148,6 +152,17 @@ public: data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor()); return remote()->transact(PULL_BATTERY_DATA, data, reply); } + + virtual sp<IRemoteDisplay> listenForRemoteDisplay(const sp<IRemoteDisplayClient>& client, + const String8& iface) + { + Parcel data, reply; + data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor()); + data.writeStrongBinder(client->asBinder()); + data.writeString8(iface); + remote()->transact(LISTEN_FOR_REMOTE_DISPLAY, data, &reply); + return interface_cast<IRemoteDisplay>(reply.readStrongBinder()); + } }; IMPLEMENT_META_INTERFACE(MediaPlayerService, "android.media.IMediaPlayerService"); @@ -242,6 +257,15 @@ status_t BnMediaPlayerService::onTransact( pullBatteryData(reply); return NO_ERROR; } break; + case LISTEN_FOR_REMOTE_DISPLAY: { + CHECK_INTERFACE(IMediaPlayerService, data, reply); + sp<IRemoteDisplayClient> client( + interface_cast<IRemoteDisplayClient>(data.readStrongBinder())); + String8 iface(data.readString8()); + sp<IRemoteDisplay> display(listenForRemoteDisplay(client, iface)); + reply->writeStrongBinder(display->asBinder()); + return NO_ERROR; + } break; default: return BBinder::onTransact(code, data, reply, flags); } diff --git a/media/libmedia/IRemoteDisplay.cpp b/media/libmedia/IRemoteDisplay.cpp new file mode 100644 index 0000000..5d6ab34 --- /dev/null +++ b/media/libmedia/IRemoteDisplay.cpp @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <stdint.h> +#include <sys/types.h> + +#include <media/IRemoteDisplay.h> + +namespace android { + +enum { + DISCONNECT = IBinder::FIRST_CALL_TRANSACTION, +}; + +class BpRemoteDisplay: public BpInterface<IRemoteDisplay> +{ +public: + BpRemoteDisplay(const sp<IBinder>& impl) + : BpInterface<IRemoteDisplay>(impl) + { + } + + status_t disconnect() + { + Parcel data, reply; + data.writeInterfaceToken(IRemoteDisplay::getInterfaceDescriptor()); + remote()->transact(DISCONNECT, data, &reply); + return reply.readInt32(); + } +}; + +IMPLEMENT_META_INTERFACE(RemoteDisplay, "android.media.IRemoteDisplay"); + +// ---------------------------------------------------------------------- + +status_t BnRemoteDisplay::onTransact( + uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) +{ + switch (code) { + case DISCONNECT: { + CHECK_INTERFACE(IRemoteDisplay, data, reply); + reply->writeInt32(disconnect()); + return NO_ERROR; + } + default: + return BBinder::onTransact(code, data, reply, flags); + } +} + +}; // namespace android diff --git a/media/libmedia/IRemoteDisplayClient.cpp b/media/libmedia/IRemoteDisplayClient.cpp new file mode 100644 index 0000000..4a1b570 --- /dev/null +++ b/media/libmedia/IRemoteDisplayClient.cpp @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <stdint.h> +#include <sys/types.h> + +#include <media/IRemoteDisplayClient.h> +#include <gui/ISurfaceTexture.h> +#include <utils/String8.h> + +namespace android { + +enum { + ON_DISPLAY_CONNECTED = IBinder::FIRST_CALL_TRANSACTION, + ON_DISPLAY_DISCONNECTED, + ON_DISPLAY_ERROR, +}; + +class BpRemoteDisplayClient: public BpInterface<IRemoteDisplayClient> +{ +public: + BpRemoteDisplayClient(const sp<IBinder>& impl) + : BpInterface<IRemoteDisplayClient>(impl) + { + } + + void onDisplayConnected(const sp<ISurfaceTexture>& surfaceTexture, + uint32_t width, uint32_t height, uint32_t flags) + { + Parcel data, reply; + data.writeInterfaceToken(IRemoteDisplayClient::getInterfaceDescriptor()); + data.writeStrongBinder(surfaceTexture->asBinder()); + data.writeInt32(width); + data.writeInt32(height); + data.writeInt32(flags); + remote()->transact(ON_DISPLAY_CONNECTED, data, &reply, IBinder::FLAG_ONEWAY); + } + + void onDisplayDisconnected() + { + Parcel data, reply; + data.writeInterfaceToken(IRemoteDisplayClient::getInterfaceDescriptor()); + remote()->transact(ON_DISPLAY_DISCONNECTED, data, &reply, IBinder::FLAG_ONEWAY); + } + + void onDisplayError(int32_t error) + { + Parcel data, reply; + data.writeInterfaceToken(IRemoteDisplayClient::getInterfaceDescriptor()); + data.writeInt32(error); + remote()->transact(ON_DISPLAY_ERROR, data, &reply, IBinder::FLAG_ONEWAY); + } +}; + +IMPLEMENT_META_INTERFACE(RemoteDisplayClient, "android.media.IRemoteDisplayClient"); + +// ---------------------------------------------------------------------- + +status_t BnRemoteDisplayClient::onTransact( + uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) +{ + switch (code) { + case ON_DISPLAY_CONNECTED: { + CHECK_INTERFACE(IRemoteDisplayClient, data, reply); + sp<ISurfaceTexture> surfaceTexture( + interface_cast<ISurfaceTexture>(data.readStrongBinder())); + uint32_t width = data.readInt32(); + uint32_t height = data.readInt32(); + uint32_t flags = data.readInt32(); + onDisplayConnected(surfaceTexture, width, height, flags); + return NO_ERROR; + } + case ON_DISPLAY_DISCONNECTED: { + CHECK_INTERFACE(IRemoteDisplayClient, data, reply); + onDisplayDisconnected(); + return NO_ERROR; + } + case ON_DISPLAY_ERROR: { + CHECK_INTERFACE(IRemoteDisplayClient, data, reply); + int32_t error = data.readInt32(); + onDisplayError(error); + return NO_ERROR; + } + default: + return BBinder::onTransact(code, data, reply, flags); + } +} + +}; // namespace android diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 166bae9..ae55642 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -44,6 +44,8 @@ #include <utils/SystemClock.h> #include <utils/Vector.h> +#include <media/IRemoteDisplay.h> +#include <media/IRemoteDisplayClient.h> #include <media/MediaPlayerInterface.h> #include <media/mediarecorder.h> #include <media/MediaMetadataRetrieverInterface.h> @@ -279,6 +281,12 @@ sp<ICrypto> MediaPlayerService::makeCrypto() { return new Crypto; } +sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay( + const sp<IRemoteDisplayClient>& client, const String8& iface) { + // TODO: implement me! + return NULL; +} + status_t MediaPlayerService::enableRemoteDisplay(const char *iface) { Mutex::Autolock autoLock(mLock); diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 2577c58..ca8a96f 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -41,6 +41,8 @@ class AudioTrack; class IMediaRecorder; class IMediaMetadataRetriever; class IOMX; +class IRemoteDisplay; +class IRemoteDisplayClient; class MediaRecorderClient; struct RemoteDisplay; @@ -248,6 +250,9 @@ public: virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat); virtual sp<IOMX> getOMX(); virtual sp<ICrypto> makeCrypto(); + + virtual sp<IRemoteDisplay> listenForRemoteDisplay(const sp<IRemoteDisplayClient>& client, + const String8& iface); virtual status_t enableRemoteDisplay(const char *iface); virtual status_t dump(int fd, const Vector<String16>& args); |