diff options
author | Sergii Piatakov <sergii.piatakov@globallogic.com> | 2018-08-06 10:30:58 +0300 |
---|---|---|
committer | Sergii Piatakov <sergii.piatakov@globallogic.com> | 2018-08-10 14:39:32 +0300 |
commit | 6a4d4d59bcbaf9e3a841a054980b0869a6be02a6 (patch) | |
tree | 008460d1000d2cee4f17343b729cad98da99d0db | |
parent | 64e7f2013b0e7ef7a57b5095ec36cd4d402279e5 (diff) | |
download | libhardware-6a4d4d59bcbaf9e3a841a054980b0869a6be02a6.tar.gz |
camera: fix `-Wmissing-field-initializers` compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
hardware/libhardware/modules/camera/3_4/Android.mk and build
mmm hardware/libhardware/modules/camera/3_4
Change-Id: I2c17b1e40b29ac400e0a950a9cd96d7f9404ea32
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
-rw-r--r-- | modules/camera/3_4/camera.cpp | 5 | ||||
-rw-r--r-- | modules/camera/3_4/request_tracker_test.cpp | 6 | ||||
-rw-r--r-- | modules/camera/3_4/static_properties_test.cpp | 25 |
3 files changed, 25 insertions, 11 deletions
diff --git a/modules/camera/3_4/camera.cpp b/modules/camera/3_4/camera.cpp index 35054a03..387134f9 100644 --- a/modules/camera/3_4/camera.cpp +++ b/modules/camera/3_4/camera.cpp @@ -504,7 +504,10 @@ void Camera::sendResult(std::shared_ptr<CaptureRequest> request) { static_cast<uint32_t>(request->output_buffers.size()), request->output_buffers.data(), request->input_buffer.get(), - 1 // Total result; only 1 part. + 1, // Total result; only 1 part. + 0, // Number of physical camera metadata. + nullptr, + nullptr }; // Make the framework callback. mCallbackOps->process_capture_result(mCallbackOps, &result); diff --git a/modules/camera/3_4/request_tracker_test.cpp b/modules/camera/3_4/request_tracker_test.cpp index 8b73bd89..001ba78b 100644 --- a/modules/camera/3_4/request_tracker_test.cpp +++ b/modules/camera/3_4/request_tracker_test.cpp @@ -35,7 +35,11 @@ class RequestTrackerTest : public Test { stream2_.max_buffers = 3; dut_.reset(new RequestTracker()); streams_ = {&stream1_, &stream2_}; - camera3_stream_configuration_t config{static_cast<uint32_t>(streams_.size()), streams_.data(), 0}; + camera3_stream_configuration_t config{ + static_cast<uint32_t>(streams_.size()), + streams_.data(), + 0, + nullptr}; dut_->SetStreamConfiguration(config); } diff --git a/modules/camera/3_4/static_properties_test.cpp b/modules/camera/3_4/static_properties_test.cpp index 2cdb9d4d..13b9e964 100644 --- a/modules/camera/3_4/static_properties_test.cpp +++ b/modules/camera/3_4/static_properties_test.cpp @@ -94,10 +94,12 @@ class StaticPropertiesTest : public Test { } else if (input) { type = CAMERA3_STREAM_INPUT; } - return {static_cast<int>(type), - static_cast<uint32_t>(width), - static_cast<uint32_t>(height), - static_cast<int>(format)}; + camera3_stream_t stream; + stream.stream_type = type; + stream.width = width; + stream.height = height; + stream.format = format; + return stream; } void ExpectConfigurationSupported(std::vector<camera3_stream_t>& streams, @@ -109,7 +111,8 @@ class StaticPropertiesTest : public Test { camera3_stream_configuration_t config = { static_cast<uint32_t>(stream_addresses.size()), stream_addresses.data(), - CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; + CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE, + nullptr}; PrepareDefaultDUT(); EXPECT_EQ(dut_->StreamConfigurationSupported(&config), expected); } @@ -435,7 +438,7 @@ TEST_F(StaticPropertiesTest, ConfigureNull) { TEST_F(StaticPropertiesTest, ConfigureEmptyStreams) { std::vector<camera3_stream_t*> streams(1); camera3_stream_configuration_t config = { - 0, streams.data(), CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; + 0, streams.data(), CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE, nullptr}; PrepareDefaultDUT(); EXPECT_FALSE(dut_->StreamConfigurationSupported(&config)); } @@ -443,7 +446,10 @@ TEST_F(StaticPropertiesTest, ConfigureEmptyStreams) { TEST_F(StaticPropertiesTest, ConfigureNullStreams) { std::vector<camera3_stream_t*> streams(2, nullptr); camera3_stream_configuration_t config = { - static_cast<uint32_t>(streams.size()), streams.data(), CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; + static_cast<uint32_t>(streams.size()), + streams.data(), + CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE, + nullptr}; PrepareDefaultDUT(); EXPECT_FALSE(dut_->StreamConfigurationSupported(&config)); } @@ -451,7 +457,7 @@ TEST_F(StaticPropertiesTest, ConfigureNullStreams) { TEST_F(StaticPropertiesTest, ConfigureNullStreamVector) { // Even if the camera claims to have multiple streams, check for null. camera3_stream_configuration_t config = { - 3, nullptr, CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE}; + 3, nullptr, CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE, nullptr}; PrepareDefaultDUT(); EXPECT_FALSE(dut_->StreamConfigurationSupported(&config)); } @@ -616,7 +622,8 @@ TEST_F(StaticPropertiesTest, ConfigureBadOperationMode) { camera3_stream_configuration_t config = { 1, &stream_address, - 99 // Not a valid operation mode. + 99, // Not a valid operation mode. + nullptr }; PrepareDefaultDUT(); EXPECT_FALSE(dut_->StreamConfigurationSupported(&config)); |