diff options
| author | David Staessens <dstaessens@google.com> | 2021-03-25 13:20:18 +0900 |
|---|---|---|
| committer | Chih-Yu Huang <akahuang@google.com> | 2021-05-12 11:50:40 +0900 |
| commit | 5a8010162665bd5546f6e040aac4bb4e5d2641cd (patch) | |
| tree | d2d3784b21ae2c0932d00b43d4bd44f113213d5a | |
| parent | df245f18d645dff635bc75f56755d8b218e3fdcb (diff) | |
| download | v4l2_codec2-5a8010162665bd5546f6e040aac4bb4e5d2641cd.tar.gz | |
v4l2_codec2: Move Fourcc to common code.
This CL Moves the Fourcc 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.
Bug: 155138142
Test: arc.VideoEncodeAccel.h264_192p_i420_vm
Change-Id: I8d04b8538187c157f052dcd200f349313a64c7c6
| -rw-r--r-- | accel/Android.bp | 1 | ||||
| -rw-r--r-- | common/Android.bp | 1 | ||||
| -rw-r--r-- | common/Fourcc.cpp (renamed from accel/fourcc.cc) | 2 | ||||
| -rw-r--r-- | common/V4L2Device.cpp | 1 | ||||
| -rw-r--r-- | common/include/v4l2_codec2/common/Fourcc.h (renamed from accel/fourcc.h) | 0 | ||||
| -rw-r--r-- | common/include/v4l2_codec2/common/V4L2Device.h | 1 | ||||
| -rw-r--r-- | components/V4L2Encoder.cpp | 1 |
7 files changed, 4 insertions, 3 deletions
diff --git a/accel/Android.bp b/accel/Android.bp index a6c933f..cce3a74 100644 --- a/accel/Android.bp +++ b/accel/Android.bp @@ -12,7 +12,6 @@ cc_library { vendor: true, srcs: [ - "fourcc.cc", "video_pixel_format.cc", ], diff --git a/common/Android.bp b/common/Android.bp index e2575d3..0e46517 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -19,6 +19,7 @@ cc_library { "Common.cpp", "EncodeHelpers.cpp", "FormatConverter.cpp", + "Fourcc.cpp", "NalParser.cpp", "V4L2ComponentCommon.cpp", "VideoTypes.cpp", diff --git a/accel/fourcc.cc b/common/Fourcc.cpp index bfca19c..17cc2a0 100644 --- a/accel/fourcc.cc +++ b/common/Fourcc.cpp @@ -3,7 +3,7 @@ // found in the LICENSE file. // Note: ported from Chromium commit head: 27c98933749f -#include "fourcc.h" +#include <v4l2_codec2/common/Fourcc.h> #include <linux/videodev2.h> diff --git a/common/V4L2Device.cpp b/common/V4L2Device.cpp index 4c93538..47b3163 100644 --- a/common/V4L2Device.cpp +++ b/common/V4L2Device.cpp @@ -33,6 +33,7 @@ #include <utils/Log.h> #include <video_pixel_format.h> +#include <v4l2_codec2/common/Fourcc.h> // VP8 parsed frames #ifndef V4L2_PIX_FMT_VP8_FRAME diff --git a/accel/fourcc.h b/common/include/v4l2_codec2/common/Fourcc.h index 9e8190f..9e8190f 100644 --- a/accel/fourcc.h +++ b/common/include/v4l2_codec2/common/Fourcc.h diff --git a/common/include/v4l2_codec2/common/V4L2Device.h b/common/include/v4l2_codec2/common/V4L2Device.h index 1103e9e..f6c19ce 100644 --- a/common/include/v4l2_codec2/common/V4L2Device.h +++ b/common/include/v4l2_codec2/common/V4L2Device.h @@ -21,7 +21,6 @@ #include <base/files/scoped_file.h> #include <base/memory/ref_counted.h> -#include <fourcc.h> #include <ui/Size.h> #include <v4l2_codec2/common/Common.h> #include <v4l2_codec2/common/V4L2DevicePoller.h> diff --git a/components/V4L2Encoder.cpp b/components/V4L2Encoder.cpp index 712b961..e8aba88 100644 --- a/components/V4L2Encoder.cpp +++ b/components/V4L2Encoder.cpp @@ -17,6 +17,7 @@ #include <log/log.h> #include <ui/Rect.h> +#include <v4l2_codec2/common/Fourcc.h> #include <v4l2_codec2/common/V4L2Device.h> #include <v4l2_codec2/components/BitstreamBuffer.h> |