Merge "camera: remove redundant and unnecessary includes" am: 9dae907ea0

am: 547abc4ae4

Change-Id: I416e1dcf1f93818fc91d71a5899b2adf4124185a
This commit is contained in:
Sergii Piatakov 2019-01-09 17:07:51 -08:00 committed by android-build-merger
commit eb83d293ff
63 changed files with 70 additions and 145 deletions

View file

@ -5,11 +5,10 @@
#include "arc/cached_frame.h"
#include <errno.h>
#include <libyuv.h>
#include <cerrno>
#include <libyuv.h>
#include "arc/common.h"
#include "arc/common_types.h"
namespace arc {

View file

@ -9,7 +9,6 @@
#include <memory>
#include <camera/CameraMetadata.h>
#include "arc/image_processor.h"
namespace arc {

View file

@ -10,7 +10,6 @@
#include <ctime>
#include <libyuv.h>
#include "arc/common.h"
namespace std {

View file

@ -5,10 +5,9 @@
#include "arc/frame_buffer.h"
#include <sys/mman.h>
#include <utility>
#include <sys/mman.h>
#include "arc/common.h"
#include "arc/image_processor.h"

View file

@ -6,14 +6,11 @@
#ifndef HAL_USB_FRAME_BUFFER_H_
#define HAL_USB_FRAME_BUFFER_H_
#include <stdint.h>
#include <cstdint>
#include <memory>
#include <string>
#include <base/files/scoped_file.h>
#include <base/synchronization/lock.h>
#include <hardware/gralloc.h>
namespace arc {

View file

@ -5,12 +5,12 @@
#include "arc/image_processor.h"
#include <errno.h>
#include <libyuv.h>
#include <time.h>
#include <cerrno>
#include <ctime>
#include <string>
#include <libyuv.h>
#include "arc/common.h"
#include "arc/common_types.h"
#include "arc/exif_utils.h"
#include "arc/jpeg_compressor.h"

View file

@ -6,14 +6,12 @@
#ifndef HAL_USB_IMAGE_PROCESSOR_H_
#define HAL_USB_IMAGE_PROCESSOR_H_
#include <string>
#include <camera/CameraMetadata.h>
// FourCC pixel formats (defined as V4L2_PIX_FMT_*).
#include <linux/videodev2.h>
// Declarations of HAL_PIXEL_FORMAT_XXX.
#include <system/graphics.h>
#include <camera/CameraMetadata.h>
#include "frame_buffer.h"
namespace arc {

View file

@ -8,8 +8,6 @@
#include <memory>
#include <errno.h>
#include "arc/common.h"
namespace arc {

View file

@ -9,7 +9,6 @@
// We must include cstdio before jpeglib.h. It is a requirement of libjpeg.
#include <cstdio>
#include <string>
#include <vector>
extern "C" {

View file

@ -19,25 +19,21 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "Camera"
#include "camera.h"
#include <cstdlib>
#include <memory>
#include <vector>
#include <stdio.h>
#include <hardware/camera3.h>
#include <sync/sync.h>
#include <system/camera_metadata.h>
#include <system/graphics.h>
#include <utils/Mutex.h>
#include "metadata/metadata_common.h"
#include <cutils/log.h>
#include "static_properties.h"
#define ATRACE_TAG (ATRACE_TAG_CAMERA | ATRACE_TAG_HAL)
#include <utils/Trace.h>
#include "camera.h"
#define CAMERA_SYNC_TIMEOUT 5000 // in msecs
namespace default_camera_hal {

View file

@ -16,8 +16,6 @@
#include "capture_request.h"
#include <set>
namespace default_camera_hal {
CaptureRequest::CaptureRequest() : CaptureRequest(nullptr) {}

View file

@ -19,7 +19,11 @@
#include "format_metadata_factory.h"
#include <algorithm>
#include <set>
#include "arc/image_processor.h"
#include "common.h"
#include "metadata/array_vector.h"
#include "metadata/partial_metadata_factory.h"
#include "metadata/property.h"

View file

@ -17,12 +17,9 @@
#ifndef V4L2_CAMERA_HAL_FORMAT_METADATA_FACTORY_H_
#define V4L2_CAMERA_HAL_FORMAT_METADATA_FACTORY_H_
#include <algorithm>
#include <iterator>
#include <memory>
#include <set>
#include "common.h"
#include "metadata/metadata_common.h"
#include "v4l2_wrapper.h"

View file

@ -14,11 +14,12 @@
* limitations under the License.
*/
#include "format_metadata_factory.h"
#include <camera/CameraMetadata.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "format_metadata_factory.h"
#include "metadata/test_common.h"
#include "v4l2_wrapper_mock.h"

View file

@ -21,8 +21,6 @@
#include <utils/Thread.h>
#include "common.h"
namespace v4l2_camera_hal {
class FunctionThread : public android::Thread {

View file

@ -17,11 +17,13 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "BoottimeStateDelegate"
#include <errno.h>
#include <string.h>
#include "boottime_state_delegate.h"
#include <cerrno>
#include <cstring>
#include "common.h"
namespace v4l2_camera_hal {
int BoottimeStateDelegate::GetValue(int64_t* value) {

View file

@ -17,7 +17,8 @@
#ifndef V4L2_CAMERA_HAL_METADATA_BOOTTIME_STATE_DELEGATE_H_
#define V4L2_CAMERA_HAL_METADATA_BOOTTIME_STATE_DELEGATE_H_
#include "../common.h"
#include <cstdint>
#include "state_delegate_interface.h"
namespace v4l2_camera_hal {

View file

@ -21,7 +21,6 @@
#include <android-base/macros.h>
#include <system/camera_metadata.h>
#include "metadata_common.h"
#include "partial_metadata_interface.h"
#include "tagged_control_delegate.h"

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_CONTROL_DELEGATE_INTERFACE_MOCK_H_
#define V4L2_CAMERA_HAL_METADATA_CONTROL_DELEGATE_INTERFACE_MOCK_H_
#include <gmock/gmock.h>
#include "control_delegate_interface.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
template <typename T>

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_CONTROL_OPTIONS_INTERFACE_MOCK_H_
#define V4L2_CAMERA_HAL_METADATA_CONTROL_OPTIONS_INTERFACE_MOCK_H_
#include <gmock/gmock.h>
#include "control_options_interface.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
template <typename T>

View file

@ -17,8 +17,6 @@
#ifndef V4L2_CAMERA_HAL_METADATA_CONVERTER_INTERFACE_H_
#define V4L2_CAMERA_HAL_METADATA_CONVERTER_INTERFACE_H_
#include "../common.h"
namespace v4l2_camera_hal {
// A ConverterInterface converts metadata values to V4L2 values vice-versa.

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_CONVERTER_INTERFACE_MOCK_H_
#define V4L2_CAMERA_HAL_METADATA_CONVERTER_INTERFACE_MOCK_H_
#include <gmock/gmock.h>
#include "converter_interface.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
template <typename TMetadata, typename TV4L2>

View file

@ -17,8 +17,6 @@
#ifndef V4L2_CAMERA_HAL_METADATA_DEFAULT_OPTION_DELEGATE_H_
#define V4L2_CAMERA_HAL_METADATA_DEFAULT_OPTION_DELEGATE_H_
#include <errno.h>
#include <map>
#include <hardware/camera3.h>

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_DEFAULT_OPTION_DELEGATE_MOCK_H_
#define V4L2_CAMERA_HAL_METADATA_DEFAULT_OPTION_DELEGATE_MOCK_H_
#include <gmock/gmock.h>
#include "default_option_delegate.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
template <typename T>

View file

@ -19,9 +19,9 @@
#include "enum_converter.h"
#include <errno.h>
#include <cerrno>
#include "../common.h"
#include "common.h"
namespace v4l2_camera_hal {

View file

@ -20,7 +20,6 @@
#include <map>
#include <android-base/macros.h>
#include "converter_interface.h"
namespace v4l2_camera_hal {

View file

@ -16,7 +16,6 @@
#include "enum_converter.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
using testing::Test;

View file

@ -17,13 +17,12 @@
#ifndef V4L2_CAMERA_HAL_METADATA_MAP_CONVERTER_H_
#define V4L2_CAMERA_HAL_METADATA_MAP_CONVERTER_H_
#include <errno.h>
#include <cerrno>
#include <map>
#include <memory>
#include <android-base/macros.h>
#include "common.h"
#include "converter_interface.h"
namespace v4l2_camera_hal {

View file

@ -17,9 +17,9 @@
#ifndef V4L2_CAMERA_HAL_METADATA_MENU_CONTROL_OPTIONS_H_
#define V4L2_CAMERA_HAL_METADATA_MENU_CONTROL_OPTIONS_H_
#include <errno.h>
#include <cerrno>
#include "../common.h"
#include "common.h"
#include "control_options_interface.h"
#include "default_option_delegate.h"

View file

@ -21,7 +21,6 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hardware/camera3.h>
#include "default_option_delegate_mock.h"
using testing::Return;

View file

@ -19,11 +19,9 @@
#include "metadata.h"
#include <camera/CameraMetadata.h>
#include <hardware/camera3.h>
#include "../common.h"
#include "metadata_common.h"
#include "common.h"
namespace v4l2_camera_hal {

View file

@ -17,11 +17,8 @@
#ifndef V4L2_CAMERA_HAL_METADATA_H_
#define V4L2_CAMERA_HAL_METADATA_H_
#include <set>
#include <android-base/macros.h>
#include <camera/CameraMetadata.h>
#include <hardware/camera3.h>
#include "metadata_common.h"

View file

@ -23,8 +23,8 @@
#include <vector>
#include <camera/CameraMetadata.h>
#include "array_vector.h"
#include "common.h"
#include "partial_metadata_interface.h"
namespace v4l2_camera_hal {

View file

@ -17,14 +17,12 @@
#ifndef DEFAULT_CAMERA_HAL_METADATA_METADATA_READER_H_
#define DEFAULT_CAMERA_HAL_METADATA_METADATA_READER_H_
#include <map>
#include <memory>
#include <set>
#include <vector>
#include <android-base/macros.h>
#include <camera/CameraMetadata.h>
#include "types.h"
namespace default_camera_hal {

View file

@ -19,10 +19,10 @@
#ifndef DEFAULT_CAMERA_HAL_METADATA_METADATA_READER_MOCK_H_
#define DEFAULT_CAMERA_HAL_METADATA_METADATA_READER_MOCK_H_
#include <gmock/gmock.h>
#include "metadata_reader.h"
#include <gmock/gmock.h>
namespace default_camera_hal {
class MetadataReaderMock : public MetadataReader {

View file

@ -17,16 +17,12 @@
#include "metadata_reader.h"
#include <camera/CameraMetadata.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <system/camera.h>
#include "array_vector.h"
#include "metadata_common.h"
using testing::AtMost;
using testing::Expectation;
using testing::Return;
using testing::Test;
namespace default_camera_hal {

View file

@ -23,7 +23,6 @@
#include <camera/CameraMetadata.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "metadata_common.h"
#include "partial_metadata_interface_mock.h"

View file

@ -17,7 +17,7 @@
#ifndef V4L2_CAMERA_HAL_METADATA_CONTROL_FACTORY_H_
#define V4L2_CAMERA_HAL_METADATA_CONTROL_FACTORY_H_
#include "../common.h"
#include "common.h"
#include "control.h"
#include "menu_control_options.h"
#include "no_effect_control_delegate.h"

View file

@ -14,15 +14,16 @@
* limitations under the License.
*/
#include "partial_metadata_factory.h"
#include <camera/CameraMetadata.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "../v4l2_wrapper_mock.h"
#include "converter_interface_mock.h"
#include "metadata_common.h"
#include "partial_metadata_factory.h"
#include "test_common.h"
#include "v4l2_wrapper_mock.h"
using testing::AtMost;
using testing::Expectation;

View file

@ -17,14 +17,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_PARTIAL_METADATA_INTERFACE_H_
#define V4L2_CAMERA_HAL_METADATA_PARTIAL_METADATA_INTERFACE_H_
#include <array>
#include <vector>
#include <camera/CameraMetadata.h>
#include "../common.h"
#include "array_vector.h"
namespace v4l2_camera_hal {
// A subset of metadata.

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_PARTIAL_METADATA_INTERFACE_MOCK_H_
#define V4L2_CAMERA_HAL_PARTIAL_METADATA_INTERFACE_MOCK_H_
#include <gmock/gmock.h>
#include "partial_metadata_interface.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
class PartialMetadataInterfaceMock : public PartialMetadataInterface {

View file

@ -17,7 +17,6 @@
#ifndef V4L2_CAMERA_HAL_METADATA_PROPERTY_H_
#define V4L2_CAMERA_HAL_METADATA_PROPERTY_H_
#include "../common.h"
#include "metadata_common.h"
#include "partial_metadata_interface.h"

View file

@ -20,19 +20,13 @@
#include <vector>
#include <camera/CameraMetadata.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hardware/camera3.h>
#include "array_vector.h"
#include "metadata_common.h"
#include "test_common.h"
using testing::AtMost;
using testing::Return;
using testing::ReturnRef;
using testing::Test;
using testing::_;
namespace v4l2_camera_hal {

View file

@ -20,7 +20,7 @@
#include <memory>
#include <android-base/macros.h>
#include "common.h"
#include "converter_interface.h"
namespace v4l2_camera_hal {

View file

@ -17,7 +17,7 @@
#ifndef V4L2_CAMERA_HAL_METADATA_SCALING_CONVERTER_H_
#define V4L2_CAMERA_HAL_METADATA_SCALING_CONVERTER_H_
#include "../common.h"
#include "common.h"
#include "converter_interface.h"
namespace v4l2_camera_hal {

View file

@ -17,11 +17,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_SLIDER_CONTROL_OPTIONS_H_
#define V4L2_CAMERA_HAL_METADATA_SLIDER_CONTROL_OPTIONS_H_
#include <errno.h>
#include <cerrno>
#include <vector>
#include "../common.h"
#include "common.h"
#include "control_options_interface.h"
#include "default_option_delegate.h"

View file

@ -21,7 +21,6 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hardware/camera3.h>
#include "default_option_delegate_mock.h"
using testing::Return;

View file

@ -17,7 +17,7 @@
#ifndef V4L2_CAMERA_HAL_METADATA_STATE_H_
#define V4L2_CAMERA_HAL_METADATA_STATE_H_
#include "../common.h"
#include "common.h"
#include "metadata_common.h"
#include "partial_metadata_interface.h"
#include "state_delegate_interface.h"

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_METADATA_STATE_DELEGATE_INTERFACE_MOCK_H_
#define V4L2_CAMERA_HAL_METADATA_STATE_DELEGATE_INTERFACE_MOCK_H_
#include <gmock/gmock.h>
#include "state_delegate_interface.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
template <typename T>

View file

@ -22,7 +22,6 @@
#include <camera/CameraMetadata.h>
#include <gtest/gtest.h>
#include "array_vector.h"
#include "metadata_common.h"

View file

@ -17,9 +17,9 @@
#ifndef V4L2_CAMERA_HAL_METADATA_V4L2_CONTROL_DELEGATE_H_
#define V4L2_CAMERA_HAL_METADATA_V4L2_CONTROL_DELEGATE_H_
#include "../v4l2_wrapper.h"
#include "control_delegate_interface.h"
#include "converter_interface.h"
#include "v4l2_wrapper.h"
namespace v4l2_camera_hal {

View file

@ -18,9 +18,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "../v4l2_wrapper_mock.h"
#include "converter_interface_mock.h"
#include "v4l2_wrapper_mock.h"
using testing::Return;
using testing::SetArgPointee;

View file

@ -21,9 +21,8 @@
#include <memory>
#include <set>
#include <hardware/camera3.h>
#include <android-base/macros.h>
#include <hardware/camera3.h>
#include "capture_request.h"
namespace default_camera_hal {

View file

@ -16,15 +16,9 @@
#include "request_tracker.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
using testing::AtMost;
using testing::Expectation;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
using testing::_;
namespace default_camera_hal {

View file

@ -21,7 +21,6 @@
#include <set>
#include <hardware/camera3.h>
#include "common.h"
#include "metadata/metadata_reader.h"
#include "metadata/types.h"

View file

@ -19,10 +19,7 @@
#include "stream_format.h"
#include <linux/videodev2.h>
#include <system/graphics.h>
#include "arc/image_processor.h"
#include "common.h"

View file

@ -17,12 +17,10 @@
#ifndef V4L2_CAMERA_HAL_STREAM_FORMAT_H_
#define V4L2_CAMERA_HAL_STREAM_FORMAT_H_
#include <string.h>
#include <cstring>
#include <linux/videodev2.h>
#include "arc/common_types.h"
#include "common.h"
namespace v4l2_camera_hal {

View file

@ -19,16 +19,14 @@
#include "v4l2_camera.h"
#include <fcntl.h>
#include <linux/videodev2.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <cstdlib>
#include <fcntl.h>
#include <camera/CameraMetadata.h>
#include <hardware/camera3.h>
#include <linux/videodev2.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "common.h"
#include "function_thread.h"
#include "metadata/metadata_common.h"

View file

@ -21,14 +21,12 @@
#include <array>
#include <condition_variable>
#include <map>
#include <queue>
#include <string>
#include <camera/CameraMetadata.h>
#include <utils/StrongPointer.h>
#include <utils/Thread.h>
#include "camera.h"
#include "common.h"
#include "metadata/metadata.h"

View file

@ -20,13 +20,11 @@
#include "v4l2_metadata_factory.h"
#include <camera/CameraMetadata.h>
#include "common.h"
#include "format_metadata_factory.h"
#include "metadata/boottime_state_delegate.h"
#include "metadata/control.h"
#include "metadata/enum_converter.h"
#include "metadata/metadata_common.h"
#include "metadata/partial_metadata_factory.h"
#include "metadata/property.h"
#include "metadata/scaling_converter.h"

View file

@ -20,18 +20,13 @@
#include "v4l2_wrapper.h"
#include <algorithm>
#include <array>
#include <limits>
#include <mutex>
#include <vector>
#include <fcntl.h>
#include <limits>
#include <android-base/unique_fd.h>
#include <linux/videodev2.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <android-base/unique_fd.h>
#include "arc/cached_frame.h"
namespace v4l2_camera_hal {

View file

@ -25,7 +25,6 @@
#include <vector>
#include <android-base/unique_fd.h>
#include "arc/common_types.h"
#include "arc/frame_buffer.h"
#include "capture_request.h"

View file

@ -19,10 +19,10 @@
#ifndef V4L2_CAMERA_HAL_V4L2_WRAPPER_MOCK_H_
#define V4L2_CAMERA_HAL_V4L2_WRAPPER_MOCK_H_
#include <gmock/gmock.h>
#include "v4l2_wrapper.h"
#include <gmock/gmock.h>
namespace v4l2_camera_hal {
class V4L2WrapperMock : public V4L2Wrapper {