v4l2_codec2: Move media::VideoPixelFormat to common code.
This CL Moves the VideoPixelFormat files to the common code folder. In a
next step these files will be cleaned up and reworked into proper
Android code, but splitting the move into a separate CL makes the review
process a lot easier.
Note: the "accel" folder is now empty, but the folder and Android.bp
files will be cleaned up in a next CL so we can properly clean
up all dependencies on the v4l2_accel module.
Bug: 155138142
Test: arc.VideoEncodeAccel.h264_192p_i420_vm
Change-Id: Ia4708e5dbdd11223b9a2c445850b8c0cf6ee6d37
diff --git a/accel/Android.bp b/accel/Android.bp
index cce3a74..0dedde8 100644
--- a/accel/Android.bp
+++ b/accel/Android.bp
@@ -11,9 +11,7 @@
name: "libv4l2_codec2_accel",
vendor: true,
- srcs: [
- "video_pixel_format.cc",
- ],
+ srcs: [ ],
shared_libs: [
"libchrome",
diff --git a/common/Android.bp b/common/Android.bp
index 0e46517..221e125 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -25,6 +25,7 @@
"VideoTypes.cpp",
"V4L2Device.cpp",
"V4L2DevicePoller.cpp",
+ "VideoPixelFormat.cpp",
],
export_include_dirs: [
diff --git a/common/Fourcc.cpp b/common/Fourcc.cpp
index 41ca1bf..71120f8 100644
--- a/common/Fourcc.cpp
+++ b/common/Fourcc.cpp
@@ -7,7 +7,6 @@
#include <linux/videodev2.h>
#include <utils/Log.h>
-#include <video_pixel_format.h>
namespace android {
diff --git a/common/V4L2Device.cpp b/common/V4L2Device.cpp
index b9d6f89..cd07f22 100644
--- a/common/V4L2Device.cpp
+++ b/common/V4L2Device.cpp
@@ -32,8 +32,8 @@
#include <base/thread_annotations.h>
#include <utils/Log.h>
-#include <video_pixel_format.h>
#include <v4l2_codec2/common/Fourcc.h>
+#include <v4l2_codec2/common/VideoPixelFormat.h>
// VP8 parsed frames
#ifndef V4L2_PIX_FMT_VP8_FRAME
diff --git a/accel/video_pixel_format.cc b/common/VideoPixelFormat.cpp
similarity index 98%
rename from accel/video_pixel_format.cc
rename to common/VideoPixelFormat.cpp
index 16e0020..ec75873 100644
--- a/accel/video_pixel_format.cc
+++ b/common/VideoPixelFormat.cpp
@@ -4,7 +4,7 @@
// Note: ported from Chromium commit head: 3b7ce92816e2
// Note: only necessary functions are ported from video_types.cc
-#include "video_pixel_format.h"
+#include <v4l2_codec2/common/VideoPixelFormat.h>
#include "base/bits.h"
#include "base/logging.h"
diff --git a/common/include/v4l2_codec2/common/Common.h b/common/include/v4l2_codec2/common/Common.h
index 78ec8ee..d18e06b 100644
--- a/common/include/v4l2_codec2/common/Common.h
+++ b/common/include/v4l2_codec2/common/Common.h
@@ -13,7 +13,8 @@
#include <ui/Rect.h>
#include <ui/Size.h>
-#include <video_pixel_format.h>
+
+#include <v4l2_codec2/common/VideoPixelFormat.h>
namespace android {
diff --git a/common/include/v4l2_codec2/common/EncodeHelpers.h b/common/include/v4l2_codec2/common/EncodeHelpers.h
index 0771088..180e1bc 100644
--- a/common/include/v4l2_codec2/common/EncodeHelpers.h
+++ b/common/include/v4l2_codec2/common/EncodeHelpers.h
@@ -9,7 +9,7 @@
#include <system/graphics.h>
#include <ui/Size.h>
-#include <video_pixel_format.h>
+#include <v4l2_codec2/common/VideoPixelFormat.h>
namespace android {
diff --git a/common/include/v4l2_codec2/common/FormatConverter.h b/common/include/v4l2_codec2/common/FormatConverter.h
index d0383d2..de9d21a 100644
--- a/common/include/v4l2_codec2/common/FormatConverter.h
+++ b/common/include/v4l2_codec2/common/FormatConverter.h
@@ -12,7 +12,8 @@
#include <C2Buffer.h>
#include <ui/Size.h>
#include <utils/StrongPointer.h>
-#include <video_pixel_format.h>
+
+#include <v4l2_codec2/common/VideoPixelFormat.h>
namespace android {
diff --git a/common/include/v4l2_codec2/common/Fourcc.h b/common/include/v4l2_codec2/common/Fourcc.h
index 71ca8e5..85da0b1 100644
--- a/common/include/v4l2_codec2/common/Fourcc.h
+++ b/common/include/v4l2_codec2/common/Fourcc.h
@@ -10,7 +10,7 @@
#include <optional>
#include <string>
-#include <video_pixel_format.h>
+#include <v4l2_codec2/common/VideoPixelFormat.h>
namespace android {
diff --git a/common/include/v4l2_codec2/common/V4L2Device.h b/common/include/v4l2_codec2/common/V4L2Device.h
index f6c19ce..fd197a2 100644
--- a/common/include/v4l2_codec2/common/V4L2Device.h
+++ b/common/include/v4l2_codec2/common/V4L2Device.h
@@ -24,8 +24,8 @@
#include <ui/Size.h>
#include <v4l2_codec2/common/Common.h>
#include <v4l2_codec2/common/V4L2DevicePoller.h>
+#include <v4l2_codec2/common/VideoPixelFormat.h>
#include <v4l2_codec2/common/VideoTypes.h>
-#include <video_pixel_format.h>
namespace android {
diff --git a/accel/video_pixel_format.h b/common/include/v4l2_codec2/common/VideoPixelFormat.h
similarity index 100%
rename from accel/video_pixel_format.h
rename to common/include/v4l2_codec2/common/VideoPixelFormat.h
diff --git a/components/V4L2EncodeComponent.cpp b/components/V4L2EncodeComponent.cpp
index 8154c3a..34c45f8 100644
--- a/components/V4L2EncodeComponent.cpp
+++ b/components/V4L2EncodeComponent.cpp
@@ -27,10 +27,10 @@
#include <v4l2_codec2/common/Common.h>
#include <v4l2_codec2/common/EncodeHelpers.h>
#include <v4l2_codec2/common/FormatConverter.h>
+#include <v4l2_codec2/common/VideoPixelFormat.h>
#include <v4l2_codec2/components/BitstreamBuffer.h>
#include <v4l2_codec2/components/V4L2EncodeInterface.h>
#include <v4l2_codec2/components/V4L2Encoder.h>
-#include <video_pixel_format.h>
using android::hardware::graphics::common::V1_0::BufferUsage;
diff --git a/components/include/v4l2_codec2/components/VideoEncoder.h b/components/include/v4l2_codec2/components/VideoEncoder.h
index 38667bd..95aa855 100644
--- a/components/include/v4l2_codec2/components/VideoEncoder.h
+++ b/components/include/v4l2_codec2/components/VideoEncoder.h
@@ -13,8 +13,8 @@
#include <ui/Size.h>
#include <v4l2_codec2/common/Common.h>
+#include <v4l2_codec2/common/VideoPixelFormat.h>
#include <v4l2_codec2/common/VideoTypes.h>
-#include <video_pixel_format.h>
namespace android {
