v4l2_codec2: Remove duplicated HalPixelFormat and InputCodec types. This CL removes the duplicate HalPixelFormat and InputCodec types in common.h that are also present in VideoTypes.h. VideoTypes.h is moved to the common/ folder so it can also be used by other classes. note: Submit together with ag/12467730 Bug: 143333813 Test: tast run $HOST arc.VideoEncodeAccel.h264_vm on hatch-arc-r Change-Id: I93bca14a3b2f0c4c49104149d5683193554ba3eb
diff --git a/common/FormatConverter.cpp b/common/FormatConverter.cpp index 657676e..9ab9161 100644 --- a/common/FormatConverter.cpp +++ b/common/FormatConverter.cpp
@@ -20,7 +20,7 @@ #include <ui/GraphicBuffer.h> #include <utils/Log.h> -#include <v4l2_codec2/common/Common.h> // for HalPixelFormat +#include <v4l2_codec2/common/VideoTypes.h> // for HalPixelFormat using android::hardware::graphics::common::V1_0::BufferUsage; @@ -131,7 +131,7 @@ // conversion to perform I420. halFormat = HalPixelFormat::YV12; } else { - halFormat = HalPixelFormat::YCbCr_420_888; // will allocate NV12 by minigbm. + halFormat = HalPixelFormat::YCBCR_420_888; // will allocate NV12 by minigbm. } uint32_t bufferCount = std::max(inputCount, kMinInputBufferCount);