diff options
author | David Staessens <dstaessens@google.com> | 2021-05-12 05:54:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 05:54:30 +0000 |
commit | c2691721cd43b329880c6d8946f7d28389dab30f (patch) | |
tree | 23d92ff0928913d7ea2ece8f3ba17279ef860148 | |
parent | 2a221a5053b6d5753c7ca273c179d89e14043840 (diff) | |
parent | 62508fd41105bd13646439d8d8df57526c4bd863 (diff) | |
download | v4l2_codec2-c2691721cd43b329880c6d8946f7d28389dab30f.tar.gz |
v4l2_codec2: Move media::VideoPixelFormat to common code. am: 62508fd411
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/14511937
Change-Id: I83f6e6e1d1ffa98f78e00dc692971b8c29425d45
-rw-r--r-- | accel/Android.bp | 4 | ||||
-rw-r--r-- | common/Android.bp | 1 | ||||
-rw-r--r-- | common/Fourcc.cpp | 1 | ||||
-rw-r--r-- | common/V4L2Device.cpp | 2 | ||||
-rw-r--r-- | common/VideoPixelFormat.cpp (renamed from accel/video_pixel_format.cc) | 2 | ||||
-rw-r--r-- | common/include/v4l2_codec2/common/Common.h | 3 | ||||
-rw-r--r-- | common/include/v4l2_codec2/common/EncodeHelpers.h | 2 | ||||
-rw-r--r-- | common/include/v4l2_codec2/common/FormatConverter.h | 3 | ||||
-rw-r--r-- | common/include/v4l2_codec2/common/Fourcc.h | 2 | ||||
-rw-r--r-- | common/include/v4l2_codec2/common/V4L2Device.h | 2 | ||||
-rw-r--r-- | common/include/v4l2_codec2/common/VideoPixelFormat.h (renamed from accel/video_pixel_format.h) | 0 | ||||
-rw-r--r-- | components/V4L2EncodeComponent.cpp | 2 | ||||
-rw-r--r-- | components/include/v4l2_codec2/components/VideoEncoder.h | 2 |
13 files changed, 13 insertions, 13 deletions
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 @@ cc_library { 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 @@ cc_library { "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 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 index 99e604a..99e604a 100644 --- a/accel/video_pixel_format.h +++ b/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 { |