Snap for 9690662 from 896de26fb1747138175169af681d92d93783113a to udc-release

Change-Id: Iab209bf1e7fd45066709ff8aeedb19991b041869

1 files changed, 81 insertions, 96 deletions

diff --git a/libhwjpeg/LibScalerForJpeg.cpp b/libhwjpeg/LibScalerForJpeg.cpp
index 1165495..1886d49 100644
--- a/libhwjpeg/LibScalerForJpeg.cpp
+++ b/libhwjpeg/LibScalerForJpeg.cpp
@@ -15,67 +15,57 @@
  * limitations under the License.
  */
 
-#include "hwjpeg-internal.h"
 #include "LibScalerForJpeg.h"
 
+#include "hwjpeg-internal.h"
+
 #define SCALER_DEV_NODE "/dev/video50"
 
-static const char *getBufTypeString(unsigned int buftype)
-{
-    if (buftype == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
-        return "destination";
-    if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-        return "source";
+static const char *getBufTypeString(unsigned int buftype) {
+    if (buftype == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return "destination";
+    if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) return "source";
     return "unknown";
 }
 
-bool LibScalerForJpeg::RunStream(int srcBuf[SCALER_MAX_PLANES], int __unused srcLen[SCALER_MAX_PLANES], int dstBuf, size_t __unused dstLen)
-{
-    if (!mSrcImage.begin(V4L2_MEMORY_DMABUF) || !mDstImage.begin(V4L2_MEMORY_DMABUF))
-        return false;
+bool LibScalerForJpeg::RunStream(int srcBuf[SCALER_MAX_PLANES],
+                                 int __unused srcLen[SCALER_MAX_PLANES], int dstBuf,
+                                 size_t __unused dstLen) {
+    if (!mSrcImage.begin(V4L2_MEMORY_DMABUF) || !mDstImage.begin(V4L2_MEMORY_DMABUF)) return false;
 
     return queue(srcBuf, dstBuf);
 }
 
-bool LibScalerForJpeg::RunStream(char *srcBuf[SCALER_MAX_PLANES], int __unused srcLen[SCALER_MAX_PLANES], int dstBuf, size_t __unused dstLen)
-{
-    if (!mSrcImage.begin(V4L2_MEMORY_USERPTR) || !mDstImage.begin(V4L2_MEMORY_DMABUF))
-        return false;
+bool LibScalerForJpeg::RunStream(char *srcBuf[SCALER_MAX_PLANES],
+                                 int __unused srcLen[SCALER_MAX_PLANES], int dstBuf,
+                                 size_t __unused dstLen) {
+    if (!mSrcImage.begin(V4L2_MEMORY_USERPTR) || !mDstImage.begin(V4L2_MEMORY_DMABUF)) return false;
 
     return queue(srcBuf, dstBuf);
 }
 
-bool LibScalerForJpeg::Image::set(unsigned int width, unsigned int height, unsigned int format)
-{
-    if (same(width, height, format))
-        return true;
+bool LibScalerForJpeg::Image::set(unsigned int width, unsigned int height, unsigned int format) {
+    if (same(width, height, format)) return true;
 
     if (memoryType != 0) {
-        if (!mDevice.requestBuffers(bufferType, memoryType, 0))
-            return false;
+        if (!mDevice.requestBuffers(bufferType, memoryType, 0)) return false;
     }
 
-    if (!mDevice.setFormat(bufferType, format, width, height, planeLen))
-        return false;
+    if (!mDevice.setFormat(bufferType, format, width, height, planeLen)) return false;
 
     memoryType = 0; // new reqbufs is required.
 
     return true;
 }
 
-bool LibScalerForJpeg::Image::begin(unsigned int memtype)
-{
+bool LibScalerForJpeg::Image::begin(unsigned int memtype) {
     if (memoryType != memtype) {
         if (memoryType != 0) {
-            if (!mDevice.requestBuffers(bufferType, memoryType, 0))
-                return false;
+            if (!mDevice.requestBuffers(bufferType, memoryType, 0)) return false;
         }
 
-        if (!mDevice.requestBuffers(bufferType, memtype, 1))
-            return false;
+        if (!mDevice.requestBuffers(bufferType, memtype, 1)) return false;
 
-        if (!mDevice.streamOn(bufferType))
-            return false;
+        if (!mDevice.streamOn(bufferType)) return false;
 
         memoryType = memtype;
     }
@@ -83,41 +73,34 @@ bool LibScalerForJpeg::Image::begin(unsigned int memtype)
     return true;
 }
 
-bool LibScalerForJpeg::Image::cancelBuffer()
-{
-    if (!mDevice.streamOff(bufferType))
-        return false;
+bool LibScalerForJpeg::Image::cancelBuffer() {
+    if (!mDevice.streamOff(bufferType)) return false;
 
-    if (!mDevice.streamOn(bufferType))
-        return false;
+    if (!mDevice.streamOn(bufferType)) return false;
 
     return true;
 }
 
-LibScalerForJpeg::Device::Device()
-{
+LibScalerForJpeg::Device::Device() {
     mFd = ::open(SCALER_DEV_NODE, O_RDWR);
-    if (mFd < 0)
-        ALOGERR("failed to open %s", SCALER_DEV_NODE);
+    if (mFd < 0) ALOGERR("failed to open %s", SCALER_DEV_NODE);
 }
 
-LibScalerForJpeg::Device::~Device()
-{
-    if (mFd >= 0)
-        ::close(mFd);
+LibScalerForJpeg::Device::~Device() {
+    if (mFd >= 0) ::close(mFd);
 }
 
-bool LibScalerForJpeg::Device::requestBuffers(unsigned int buftype, unsigned int memtype, unsigned int count)
-{
-    // count==0 means this port should be reconfigured and it is successful under streaming is finished.
-    if (!count)
-        streamOff(buftype);
+bool LibScalerForJpeg::Device::requestBuffers(unsigned int buftype, unsigned int memtype,
+                                              unsigned int count) {
+    // count==0 means this port should be reconfigured and it is successful under streaming is
+    // finished.
+    if (!count) streamOff(buftype);
 
     v4l2_requestbuffers reqbufs{};
 
-    reqbufs.type    = buftype;
-    reqbufs.memory  = memtype;
-    reqbufs.count   = count;
+    reqbufs.type = buftype;
+    reqbufs.memory = memtype;
+    reqbufs.count = count;
 
     if (ioctl(mFd, VIDIOC_REQBUFS, &reqbufs) < 0) {
         ALOGERR("failed REQBUFS(%s, mem=%d, count=%d)", getBufTypeString(buftype), memtype, count);
@@ -127,29 +110,30 @@ bool LibScalerForJpeg::Device::requestBuffers(unsigned int buftype, unsigned int
     return true;
 }
 
-bool LibScalerForJpeg::Device::setFormat(unsigned int buftype, unsigned int format, unsigned int width, unsigned int height, unsigned int planelen[SCALER_MAX_PLANES])
-{
+bool LibScalerForJpeg::Device::setFormat(unsigned int buftype, unsigned int format,
+                                         unsigned int width, unsigned int height,
+                                         unsigned int planelen[SCALER_MAX_PLANES]) {
     v4l2_format fmt{};
 
     fmt.type = buftype;
     fmt.fmt.pix_mp.pixelformat = format;
-    fmt.fmt.pix_mp.width  = width;
+    fmt.fmt.pix_mp.width = width;
     fmt.fmt.pix_mp.height = height;
 
     if (ioctl(mFd, VIDIOC_S_FMT, &fmt) < 0) {
-        ALOGERR("failed S_FMT(%s, fmt=h'%x, %ux%u)", getBufTypeString(buftype), format, width, height);
+        ALOGERR("failed S_FMT(%s, fmt=h'%x, %ux%u)", getBufTypeString(buftype), format, width,
+                height);
         return false;
     }
 
-    for (uint32_t i = 0; i < fmt.fmt.pix_mp.num_planes ; i++) {
+    for (uint32_t i = 0; i < fmt.fmt.pix_mp.num_planes; i++) {
         planelen[i] = fmt.fmt.pix_mp.plane_fmt[i].sizeimage;
     }
 
     return true;
 }
 
-bool LibScalerForJpeg::Device::streamOn(unsigned int buftype)
-{
+bool LibScalerForJpeg::Device::streamOn(unsigned int buftype) {
     if (ioctl(mFd, VIDIOC_STREAMON, &buftype) < 0) {
         ALOGERR("failed STREAMON for %s", getBufTypeString(buftype));
         return false;
@@ -158,8 +142,7 @@ bool LibScalerForJpeg::Device::streamOn(unsigned int buftype)
     return true;
 }
 
-bool LibScalerForJpeg::Device::streamOff(unsigned int buftype)
-{
+bool LibScalerForJpeg::Device::streamOff(unsigned int buftype) {
     if (ioctl(mFd, VIDIOC_STREAMOFF, &buftype) < 0) {
         ALOGERR("failed STREAMOFF for %s", getBufTypeString(buftype));
         return false;
@@ -168,8 +151,8 @@ bool LibScalerForJpeg::Device::streamOff(unsigned int buftype)
     return true;
 }
 
-bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, std::function<void(v4l2_buffer &)> bufferFiller)
-{
+bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype,
+                                           std::function<void(v4l2_buffer &)> bufferFiller) {
     v4l2_buffer buffer{};
     v4l2_plane plane[SCALER_MAX_PLANES];
 
@@ -183,47 +166,50 @@ bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, std::function<v
     return ioctl(mFd, VIDIOC_QBUF, &buffer) >= 0;
 }
 
-bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, int buf[SCALER_MAX_PLANES], unsigned int len[SCALER_MAX_PLANES])
-{
-    if (!queueBuffer(buftype, [buf, len] (v4l2_buffer &buffer) {
-                buffer.memory = V4L2_MEMORY_DMABUF;
-                buffer.length = SCALER_MAX_PLANES;
-                for (unsigned int i = 0; i < SCALER_MAX_PLANES; i++) {
-                    buffer.m.planes[i].m.fd = buf[i];
-                    buffer.m.planes[i].length = len[i];
-                } })) {
-        ALOGERR("failed QBUF(%s, fd[]=%d %d, len[0]=%d %d)", getBufTypeString(buftype), buf[0], buf[1], len[0], len[1]);
+bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, int buf[SCALER_MAX_PLANES],
+                                           unsigned int len[SCALER_MAX_PLANES]) {
+    if (!queueBuffer(buftype, [buf, len](v4l2_buffer &buffer) {
+            buffer.memory = V4L2_MEMORY_DMABUF;
+            buffer.length = SCALER_MAX_PLANES;
+            for (unsigned int i = 0; i < SCALER_MAX_PLANES; i++) {
+                buffer.m.planes[i].m.fd = buf[i];
+                buffer.m.planes[i].length = len[i];
+            }
+        })) {
+        ALOGERR("failed QBUF(%s, fd[]=%d %d, len[0]=%d %d)", getBufTypeString(buftype), buf[0],
+                buf[1], len[0], len[1]);
         return false;
     }
 
     return true;
 }
 
-bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, char *buf[SCALER_MAX_PLANES], unsigned int len[SCALER_MAX_PLANES])
-{
-    if (!queueBuffer(buftype, [buf, len] (v4l2_buffer &buffer) {
-                buffer.memory = V4L2_MEMORY_USERPTR;
-                buffer.length = SCALER_MAX_PLANES;
-                for (unsigned int i = 0; i < SCALER_MAX_PLANES; i++) {
-                    buffer.m.planes[i].m.userptr = reinterpret_cast<unsigned long>(buf[i]);
-                    buffer.m.planes[i].length = len[i];
-                } })) {
-        ALOGERR("failed QBUF(%s, ptr[]=%p %p, len[0]=%d %d)", getBufTypeString(buftype), buf[0], buf[1], len[0], len[1]);
+bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, char *buf[SCALER_MAX_PLANES],
+                                           unsigned int len[SCALER_MAX_PLANES]) {
+    if (!queueBuffer(buftype, [buf, len](v4l2_buffer &buffer) {
+            buffer.memory = V4L2_MEMORY_USERPTR;
+            buffer.length = SCALER_MAX_PLANES;
+            for (unsigned int i = 0; i < SCALER_MAX_PLANES; i++) {
+                buffer.m.planes[i].m.userptr = reinterpret_cast<unsigned long>(buf[i]);
+                buffer.m.planes[i].length = len[i];
+            }
+        })) {
+        ALOGERR("failed QBUF(%s, ptr[]=%p %p, len[0]=%d %d)", getBufTypeString(buftype), buf[0],
+                buf[1], len[0], len[1]);
         return false;
     }
 
     return true;
 }
 
-bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, int buf, unsigned int len[SCALER_MAX_PLANES])
-{
-    if (!queueBuffer(buftype, [buf, len] (v4l2_buffer &buffer)
-                {
-                    buffer.memory = V4L2_MEMORY_DMABUF;
-                    buffer.length = 1;
-                    buffer.m.planes[0].m.fd = buf;
-                    buffer.m.planes[0].length = len[0];
-                })) {
+bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, int buf,
+                                           unsigned int len[SCALER_MAX_PLANES]) {
+    if (!queueBuffer(buftype, [buf, len](v4l2_buffer &buffer) {
+            buffer.memory = V4L2_MEMORY_DMABUF;
+            buffer.length = 1;
+            buffer.m.planes[0].m.fd = buf;
+            buffer.m.planes[0].length = len[0];
+        })) {
         ALOGERR("failed QBUF(%s, fd=%d, len=%d", getBufTypeString(buftype), buf, len[0]);
         return false;
     }
@@ -231,8 +217,7 @@ bool LibScalerForJpeg::Device::queueBuffer(unsigned int buftype, int buf, unsign
     return true;
 }
 
-bool LibScalerForJpeg::Device::dequeueBuffer(unsigned int buftype, unsigned int memtype)
-{
+bool LibScalerForJpeg::Device::dequeueBuffer(unsigned int buftype, unsigned int memtype) {
     v4l2_buffer buffer{};
     v4l2_plane plane[SCALER_MAX_PLANES];
 
@@ -244,7 +229,7 @@ bool LibScalerForJpeg::Device::dequeueBuffer(unsigned int buftype, unsigned int
 
     buffer.m.planes = plane;
 
-    if (ioctl(mFd, VIDIOC_DQBUF, &buffer) < 0 ) {
+    if (ioctl(mFd, VIDIOC_DQBUF, &buffer) < 0) {
         ALOGERR("failed DQBUF(%s)", getBufTypeString(buftype));
         return false;
     }