summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-10-23 08:51:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-23 08:51:19 -0700
commit871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc (patch)
treef42e93d9fc9c977a0e6ff41dab67ab5917d98b93 /include
parent1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c (diff)
parente84729002102622b40bd6efddffb76909615c12a (diff)
downloadframeworks_base-871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc.zip
frameworks_base-871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc.tar.gz
frameworks_base-871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc.tar.bz2
am e8472900: Merge change Ie13526ad into eclair-mr2
Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp * commit 'e84729002102622b40bd6efddffb76909615c12a': Prefer software decoders over hardware for thumbnail extraction.
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/OMXCodec.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index dfc902e..d0f4f17 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -30,11 +30,15 @@ struct OMXCodecObserver;
struct OMXCodec : public MediaSource,
public MediaBufferObserver {
+ enum CreationFlags {
+ kPreferSoftwareCodecs = 1,
+ };
static sp<OMXCodec> Create(
const sp<IOMX> &omx,
const sp<MetaData> &meta, bool createEncoder,
const sp<MediaSource> &source,
- const char *matchComponentName = NULL);
+ const char *matchComponentName = NULL,
+ uint32_t flags = 0);
static void setComponentRole(
const sp<IOMX> &omx, IOMX::node_id node, bool isEncoder,
@@ -207,6 +211,14 @@ private:
void dumpPortStatus(OMX_U32 portIndex);
+ static uint32_t getComponentQuirks(const char *componentName);
+
+ static void findMatchingCodecs(
+ const char *mime,
+ bool createEncoder, const char *matchComponentName,
+ uint32_t flags,
+ Vector<String8> *matchingCodecs);
+
OMXCodec(const OMXCodec &);
OMXCodec &operator=(const OMXCodec &);
};