commit a37e536abf2847ab71490c212ee84b30923db3f9
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Jul 20 09:54:29 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 20 22:27:43 2018 +0000
tree 3ff9b07f6607c6e07135c6f29d2985ff8f443b62
parent ceec93cac7eccf1ae0ae987f92164988fc129ea0

Return zero size buffers in wrap() for nullptr input

Bug: 111662143
Bug: 111611824
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases \
   -t android.media.cts.NativeDecoderTest#testDataSourceWithCallback

Change-Id: I6bca99d466c1377488eee73cb5ab74627a360795
(cherry picked from commit fe5b29a7b834eedd0227772d59ae2b3a6dbe7409)

media/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/sfplugin/CCodecBufferChannel.cpp b/media/sfplugin/CCodecBufferChannel.cpp
index a86552e..786c6fd 100644
--- a/media/sfplugin/CCodecBufferChannel.cpp
+++ b/media/sfplugin/CCodecBufferChannel.cpp
@@ -1169,11 +1169,13 @@
 
     sp<Codec2Buffer> wrap(const std::shared_ptr<C2Buffer> &buffer) override {
         if (buffer == nullptr) {
-            return ConstGraphicBlockBuffer::AllocateEmpty(
+            sp<Codec2Buffer> c2buffer = ConstGraphicBlockBuffer::AllocateEmpty(
                     mFormat,
                     [lbp = mLocalBufferPool](size_t capacity) {
                         return lbp->newBuffer(capacity);
                     });
+            c2buffer->setRange(0, 0);
+            return c2buffer;
         } else {
             return ConstGraphicBlockBuffer::Allocate(
                     mFormat,