diff options
| author | Chong Zhang <chz@google.com> | 2015-07-29 01:12:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 01:12:31 +0000 |
| commit | f5b8005b024316febc9d8428092fef68f4b2ea2e (patch) | |
| tree | 67d14735d5041ff97278fb89244563745eeb5f10 /media | |
| parent | 6134ad6fdeab91e54a1abc8f00eafc956e42fb3d (diff) | |
| parent | f42917964a76720932b23e67a05d034cd0cf346b (diff) | |
| download | frameworks_av-f5b8005b024316febc9d8428092fef68f4b2ea2e.zip frameworks_av-f5b8005b024316febc9d8428092fef68f4b2ea2e.tar.gz frameworks_av-f5b8005b024316febc9d8428092fef68f4b2ea2e.tar.bz2 | |
Merge "add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 4e1f094..e904c49 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -668,8 +668,7 @@ status_t ACodec::handleSetSurface(const sp<Surface> &surface) { return err; } - int ignoredFlags = (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_COMPOSER - | GRALLOC_USAGE_EXTERNAL_DISP); + int ignoredFlags = kVideoGrallocUsage; // New output surface is not allowed to add new usage flag except ignored ones. if ((usageBits & ~(mNativeWindowUsageBits | ignoredFlags)) != 0) { ALOGW("cannot change usage from %#x to %#x", mNativeWindowUsageBits, usageBits); @@ -905,7 +904,7 @@ status_t ACodec::setupNativeWindowSizeFormatAndUsage( usage |= GRALLOC_USAGE_PROTECTED; } - usage |= GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP; + usage |= kVideoGrallocUsage; *finalUsage = usage; ALOGV("gralloc usage: %#x(OMX) => %#x(ACodec)", omxUsage, usage); |