Abstract V4L2 controls into wrapper class.
This abstraction will both clean up the code in V4L2Camera.cpp, and make it
easier to implement tests in the future (by mocking over the class).
This CL only adds the class and implementation, it does not yet replace
the logic in V4L2Camera.cpp.
Also gates building the module, to prevent checkbuilds without the
proper v4l2 kernel headers from trying to build it.
BUG: 30140438
Change-Id: I4e5feee30fdf896b1f71f0df492ca313f5581e78
diff --git a/modules/camera/3_4/StreamFormat.h b/modules/camera/3_4/StreamFormat.h
new file mode 100644
index 0000000..3686564
--- /dev/null
+++ b/modules/camera/3_4/StreamFormat.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef V4L2_STREAM_FORMAT_H_
+#define V4L2_STREAM_FORMAT_H_
+
+#include <linux/videodev2.h>
+
+#include "Common.h"
+#include "Stream.h"
+
+namespace v4l2_camera_hal {
+
+enum FormatCategory {
+ kFormatCategoryRaw,
+ kFormatCategoryStalling,
+ kFormatCategoryNonStalling,
+ kFormatCategoryUnknown,
+};
+
+class StreamFormat {
+ public:
+ StreamFormat(const default_camera_hal::Stream& stream);
+ StreamFormat(const v4l2_format& format);
+ virtual ~StreamFormat();
+ // Only uint32_t members, use default generated copy and assign.
+
+ void FillFormatRequest(v4l2_format* format) const;
+ FormatCategory Category() const;
+ inline uint32_t get_type() const { return type_; };
+
+ bool operator==(const StreamFormat& other) const;
+ bool operator!=(const StreamFormat& other) const;
+
+ // HAL <-> V4L2 conversions
+ // Returns 0 for unrecognized.
+ static uint32_t HalToV4L2PixelFormat(int hal_pixel_format);
+ // Returns -1 for unrecognized.
+ static int V4L2ToHalPixelFormat(uint32_t v4l2_pixel_format);
+
+ private:
+ uint32_t type_;
+ uint32_t v4l2_pixel_format_;
+ uint32_t width_;
+ uint32_t height_;
+ uint32_t bytes_per_line_;
+ uint32_t min_buffer_size_;
+};
+
+} // namespace v4l2_camera_hal
+
+#endif // V4L2_STREAM_FORMAT_H_