summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-18 11:50:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 11:50:19 -0700
commit9b2f18df2436b6c2d9735e65119b92f320bb57e2 (patch)
tree9cdb635b45b1f29b81ae5d517cf07f36b75a04bb /include
parentec62719c8396997b436c44906c2760e3914698b8 (diff)
parentbc96c2848dadaa844f95e89708d9941f73bbf400 (diff)
downloadframeworks_base-9b2f18df2436b6c2d9735e65119b92f320bb57e2.zip
frameworks_base-9b2f18df2436b6c2d9735e65119b92f320bb57e2.tar.gz
frameworks_base-9b2f18df2436b6c2d9735e65119b92f320bb57e2.tar.bz2
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 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp * commit 'bc96c2848dadaa844f95e89708d9941f73bbf400': 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')
-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,