From e104596061b219e9bce6d4db49a9d15242f8d2e5 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 4 Sep 2012 21:38:42 -0700 Subject: Implement remote display service stubs. Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01 --- include/media/IMediaPlayerService.h | 12 ++++++ include/media/IRemoteDisplay.h | 62 ++++++++++++++++++++++++++++ include/media/IRemoteDisplayClient.h | 80 ++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 include/media/IRemoteDisplay.h create mode 100644 include/media/IRemoteDisplayClient.h (limited to 'include') diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 172975cb..c4c37b6f 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 getOMX() = 0; virtual sp 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 listenForRemoteDisplay(const sp& 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 00000000..f39286e0 --- /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 +#include + +#include +#include +#include + +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 +{ +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 00000000..38a0c9a3 --- /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 +#include + +#include +#include +#include + +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& 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 +{ +public: + virtual status_t onTransact( uint32_t code, + const Parcel& data, + Parcel* reply, + uint32_t flags = 0); +}; + +}; // namespace android + +#endif // ANDROID_IREMOTEDISPLAYCLIENT_H -- cgit v1.2.3