commit 4d7aacd7e12f084aed2bc8cfe28daa0dc915a08b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 23 21:11:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 21:11:15 2017 +0000
tree cf7d52b97c455f21d3ef783ea870e8c9ccc1e0c2
parent d0844433fff7aea6473235422c452f2677c87502
parent 607e65286b7c3dcd06b7175c9d81b82e6fcfcb9a

Merge "Revert "ACodec: update native window crop rectangle""

media/libstagefright/ACodecBufferChannel.cpp

diff --git a/media/libstagefright/ACodecBufferChannel.cpp b/media/libstagefright/ACodecBufferChannel.cpp
index 259e134..ecbbd03 100644
--- a/media/libstagefright/ACodecBufferChannel.cpp
+++ b/media/libstagefright/ACodecBufferChannel.cpp
@@ -75,6 +75,9 @@
 }
 
 status_t ACodecBufferChannel::queueInputBuffer(const sp<MediaCodecBuffer> &buffer) {
+    if (mDealer != nullptr) {
+        return -ENOSYS;
+    }
     std::shared_ptr<const std::vector<const BufferInfo>> array(
             std::atomic_load(&mInputBuffers));
     BufferInfoIterator it = findClientBuffer(array, buffer);
@@ -94,7 +97,7 @@
         const uint8_t *iv, CryptoPlugin::Mode mode, CryptoPlugin::Pattern pattern,
         const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,
         AString *errorDetailMsg) {
-    if (!hasCryptoOrDescrambler()) {
+    if (!hasCryptoOrDescrambler() || mDealer == nullptr) {
         return -ENOSYS;
     }
     std::shared_ptr<const std::vector<const BufferInfo>> array(