Deprecate/remove now unused socketpair ipc communication in favour of exclusive binder use.

2 files changed, 0 insertions, 36 deletions

diff --git a/include/media/IOMX.h b/include/media/IOMX.h
index 0010d84..857b2bd 100644
--- a/include/media/IOMX.h
+++ b/include/media/IOMX.h
@@ -25,8 +25,6 @@
 #include <OMX_Core.h>
 #include <OMX_Video.h>
 
-#define IOMX_USES_SOCKETS       0
-
 namespace android {
 
 class IMemory;
@@ -41,12 +39,6 @@ public:
     typedef void *buffer_id;
     typedef void *node_id;
 
-#if IOMX_USES_SOCKETS
-    // If successful, returns a socket descriptor used for further
-    // communication. Caller assumes ownership of "*sd".
-    virtual status_t connect(int *sd) = 0;
-#endif
-
     virtual status_t list_nodes(List<String8> *list) = 0;
 
     virtual status_t allocate_node(const char *name, node_id *node) = 0;
@@ -78,7 +70,6 @@ public:
     virtual status_t free_buffer(
             node_id node, OMX_U32 port_index, buffer_id buffer) = 0;
 
-#if !IOMX_USES_SOCKETS
     virtual status_t observe_node(
             node_id node, const sp<IOMXObserver> &observer) = 0;
 
@@ -89,7 +80,6 @@ public:
             buffer_id buffer,
             OMX_U32 range_offset, OMX_U32 range_length,
             OMX_U32 flags, OMX_TICKS timestamp) = 0;
-#endif
 
     virtual sp<IOMXRenderer> createRenderer(
             const sp<ISurface> &surface,
@@ -105,14 +95,6 @@ struct omx_message {
         EMPTY_BUFFER_DONE,
         FILL_BUFFER_DONE,
 
-#if IOMX_USES_SOCKETS
-        EMPTY_BUFFER,
-        FILL_BUFFER,
-        SEND_COMMAND,
-        DISCONNECT,
-        DISCONNECTED,
-#endif
-
         // reserved for OMXDecoder use.
         START,
         INITIAL_FILL_BUFFER,
diff --git a/include/media/stagefright/OMXClient.h b/include/media/stagefright/OMXClient.h
index 454c38b..7027e1b 100644
--- a/include/media/stagefright/OMXClient.h
+++ b/include/media/stagefright/OMXClient.h
@@ -87,32 +87,14 @@ public:
     status_t registerObserver(IOMX::node_id node, OMXObserver *observer);
     void unregisterObserver(IOMX::node_id node);
 
-    status_t fillBuffer(IOMX::node_id node, IOMX::buffer_id buffer);
-
-    status_t emptyBuffer(
-            IOMX::node_id node, IOMX::buffer_id buffer,
-            OMX_U32 range_offset, OMX_U32 range_length,
-            OMX_U32 flags, OMX_TICKS timestamp);
-
-    status_t send_command(
-            IOMX::node_id node, OMX_COMMANDTYPE cmd, OMX_S32 param);
-
 private:
     sp<IOMX> mOMX;
-
-    int mSock;
     Mutex mLock;
-    pthread_t mThread;
 
     KeyedVector<IOMX::node_id, OMXObserver *> mObservers;
 
     sp<OMXClientReflector> mReflector;
 
-#if IOMX_USES_SOCKETS
-    static void *ThreadWrapper(void *me);
-    void threadEntry();
-#endif
-
     bool onOMXMessage(const omx_message &msg);
 
     OMXClient(const OMXClient &);