diff options
author | Andreas Huber <andih@google.com> | 2009-12-03 16:40:04 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 16:40:04 -0800 |
commit | 49096a039a16ea1cb2fc121c9de168be3f088e19 (patch) | |
tree | d27f01bd5264e8eb598d28e0158ec524b71c0120 /include/media | |
parent | 4e1e4bfb43d14d867345da7e0680c4636f40f63b (diff) | |
parent | 572e6a5cea656c1df50f69df9730f2dc351308de (diff) | |
download | frameworks_av-49096a039a16ea1cb2fc121c9de168be3f088e19.zip frameworks_av-49096a039a16ea1cb2fc121c9de168be3f088e19.tar.gz frameworks_av-49096a039a16ea1cb2fc121c9de168be3f088e19.tar.bz2 |
am 2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp
* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
Squashed commit of the following:
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/HardwareAPI.h | 3 | ||||
-rw-r--r-- | include/media/stagefright/OMXPluginBase.h | 51 |
2 files changed, 54 insertions, 0 deletions
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_ |