diff options
| author | Lajos Molnar <lajos@google.com> | 2015-05-02 03:00:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-02 03:00:34 +0000 |
| commit | 4068b1392b18d9f0d9e866b50d716e2ef8dfa37c (patch) | |
| tree | 691b6bc4e9a5011b38233f01df9e0486d9ce759a /media | |
| parent | 8ce74c3c11458faa34395591a3424e90db856bfc (diff) | |
| parent | 9b73fa9a02b7234b43ac2be66a3328ff36d39c2d (diff) | |
| download | frameworks_av-4068b1392b18d9f0d9e866b50d716e2ef8dfa37c.zip frameworks_av-4068b1392b18d9f0d9e866b50d716e2ef8dfa37c.tar.gz frameworks_av-4068b1392b18d9f0d9e866b50d716e2ef8dfa37c.tar.bz2 | |
Merge "stagefright: propagate consumer usage flags in MediaSync" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MediaSync.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MediaSync.cpp b/media/libstagefright/MediaSync.cpp index 85027ce..ad4b7a3 100644 --- a/media/libstagefright/MediaSync.cpp +++ b/media/libstagefright/MediaSync.cpp @@ -180,6 +180,10 @@ status_t MediaSync::createInputSurface( bufferConsumer->consumerConnect(listener, false /* controlledByApp */); if (status == NO_ERROR) { bufferConsumer->setConsumerName(String8("MediaSync")); + // propagate usage bits from output surface + int usage = 0; + mOutput->query(NATIVE_WINDOW_CONSUMER_USAGE_BITS, &usage); + bufferConsumer->setConsumerUsageBits(usage); *outBufferProducer = bufferProducer; mInput = bufferConsumer; } |