commit 3664a25aa7d68bd80c13282e4cfb6fb6589a81f8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 09 01:23:12 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 09 01:23:12 2019 +0000
tree 0c0ce0f7c6c107db7d318ca4d6d392a4c66bf23f
parent 48d500c9e3e06fe1276cf5a9d381e549172de94c
parent 688d3bf720fbb59db4843dcae83381dc4c4d3fb6

Merge "camera: allow to get size of JPEG after conversion"

modules/camera/3_4/arc/image_processor.cpp

diff --git a/modules/camera/3_4/arc/image_processor.cpp b/modules/camera/3_4/arc/image_processor.cpp
index f0fee91..7fb6219 100644
--- a/modules/camera/3_4/arc/image_processor.cpp
+++ b/modules/camera/3_4/arc/image_processor.cpp
@@ -85,6 +85,8 @@
     case V4L2_PIX_FMT_BGR32:
     case V4L2_PIX_FMT_RGB32:
       return width * height * 4;
+    case V4L2_PIX_FMT_JPEG:
+      return 0; // For JPEG real size will be calculated after conversion.
     default:
       LOGF(ERROR) << "Pixel format " << FormatToString(fourcc)
                   << " is unsupported.";
@@ -388,6 +390,9 @@
     return false;
   }
   size_t buffer_length = compressor.GetCompressedImageSize();
+  if (out_frame->SetDataSize(buffer_length)) {
+    return false;
+  }
   memcpy(out_frame->GetData(), compressor.GetCompressedImagePtr(),
          buffer_length);
   return true;