summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-03-16 11:44:07 -0700
committerAndreas Huber <andih@google.com>2010-03-16 11:44:07 -0700
commit2a09c7e042d6a3ae600b25f606d584368a6e3f3a (patch)
treeca27a6e6d07e40655558d3a65044559a579f5bac /include/media
parentd489240362d24461e22346bc98a49347dfd4311d (diff)
downloadframeworks_base-2a09c7e042d6a3ae600b25f606d584368a6e3f3a.zip
frameworks_base-2a09c7e042d6a3ae600b25f606d584368a6e3f3a.tar.gz
frameworks_base-2a09c7e042d6a3ae600b25f606d584368a6e3f3a.tar.bz2
Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails.
Change-Id: Id1c699711e30139c9cc29df972254b5ba026e6fb related-to-bug: 2517098
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/OMXCodec.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 24c2f46..d58c711 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -167,7 +167,7 @@ private:
status_t setupMPEG4EncoderParameters();
status_t setupAVCEncoderParameters();
- void setVideoOutputFormat(
+ status_t setVideoOutputFormat(
const char *mime, OMX_U32 width, OMX_U32 height);
void setImageOutputFormat(
@@ -220,6 +220,8 @@ private:
void dumpPortStatus(OMX_U32 portIndex);
+ status_t configureCodec(const sp<MetaData> &meta);
+
static uint32_t getComponentQuirks(const char *componentName);
static void findMatchingCodecs(