From e3ec3cec3a2e27033249ff82964d2cbd441d9873 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Thu, 3 Dec 2009 11:39:54 -0800
Subject: Squashed commit of the following:

commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 3 11:33:57 2009 -0800

    stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...

commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 2 12:39:07 2009 -0800

    More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
---
 include/media/stagefright/HardwareAPI.h   |  3 ++
 include/media/stagefright/OMXPluginBase.h | 51 +++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 include/media/stagefright/OMXPluginBase.h

(limited to 'include')

diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h
index 7e1f08d..b7daddc 100644
--- a/include/media/stagefright/HardwareAPI.h
+++ b/include/media/stagefright/HardwareAPI.h
@@ -18,6 +18,7 @@
 
 #define HARDWARE_API_H_
 
+#include <media/stagefright/OMXPluginBase.h>
 #include <media/stagefright/VideoRenderer.h>
 #include <ui/ISurface.h>
 #include <utils/RefBase.h>
@@ -31,5 +32,7 @@ extern android::VideoRenderer *createRenderer(
         size_t displayWidth, size_t displayHeight,
         size_t decodedWidth, size_t decodedHeight);
 
+extern android::OMXPluginBase *createOMXPlugin();
+
 #endif  // HARDWARE_API_H_
 
diff --git a/include/media/stagefright/OMXPluginBase.h b/include/media/stagefright/OMXPluginBase.h
new file mode 100644
index 0000000..9643c5f
--- /dev/null
+++ b/include/media/stagefright/OMXPluginBase.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2009 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 OMX_PLUGIN_BASE_H_
+
+#define OMX_PLUGIN_BASE_H_
+
+#include <sys/types.h>
+
+#include <OMX_Component.h>
+
+namespace android {
+
+struct OMXComponentBase;
+
+struct OMXPluginBase {
+    OMXPluginBase() {}
+    virtual ~OMXPluginBase() {}
+
+    virtual OMX_ERRORTYPE makeComponentInstance(
+            const char *name,
+            const OMX_CALLBACKTYPE *callbacks,
+            OMX_PTR appData,
+            OMX_COMPONENTTYPE **component) = 0;
+
+    virtual OMX_ERRORTYPE enumerateComponents(
+            OMX_STRING name,
+            size_t size,
+            OMX_U32 index) = 0;
+
+private:
+    OMXPluginBase(const OMXPluginBase &);
+    OMXPluginBase &operator=(const OMXPluginBase &);
+};
+
+}  // namespace android
+
+#endif  // OMX_PLUGIN_BASE_H_
-- 
cgit v1.1