summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-19 09:52:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-19 09:52:25 -0700
commit2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab (patch)
tree7e5bde609de27235b221dd716c6e417c2cf35d79 /include/media
parent9969c0b798ad81764b67f5a098f7c417b82dcc89 (diff)
parent1bd36ef733ad5c5fa06106387e7ee0df39c33116 (diff)
downloadframeworks_av-2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab.zip
frameworks_av-2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab.tar.gz
frameworks_av-2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab.tar.bz2
am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2' * commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/OMXCodec.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 2bb7783..1d94160 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -33,7 +33,11 @@ struct OMXCodec : public MediaSource,
public MediaBufferObserver {
enum CreationFlags {
kPreferSoftwareCodecs = 1,
- kIgnoreCodecSpecificData = 2
+ kIgnoreCodecSpecificData = 2,
+
+ // The client wants to access the output buffer's video
+ // data for example for thumbnail extraction.
+ kClientNeedsFramebuffer = 4,
};
static sp<MediaSource> Create(
const sp<IOMX> &omx,