diff options
| author | Chong Zhang <chz@google.com> | 2019-06-27 14:28:37 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2019-06-27 16:38:44 -0700 |
| commit | ab123ac62c872f89e20f10c96e651ead21414ffc (patch) | |
| tree | 61f45a95ef42e952ec121583ed73b8649e058bc1 /files/source/video_common.cc | |
| parent | ad97fd58c110036d9dfcdce8bf98282e92707a89 (diff) | |
| download | libyuv-ab123ac62c872f89e20f10c96e651ead21414ffc.tar.gz | |
libyuv roll to r1722 to pick up a few methods
that we've been manually cherry-picking.
bug: 132357297
test: MediaMetadataRetriever test; manual testing
thumbnails in Photos.
Exempt-From-Owner-Approval:
files/infra/config/OWNERS owner names are not in android
gerrit, CL fail to push with these. Delete of file need
to bypass owner.
Change-Id: Ic22346e45671452429716be8b0a1999eeaea0d7b
Diffstat (limited to 'files/source/video_common.cc')
| -rw-r--r-- | files/source/video_common.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/files/source/video_common.cc b/files/source/video_common.cc index 3e9c6a29..92384c05 100644 --- a/files/source/video_common.cc +++ b/files/source/video_common.cc @@ -15,14 +15,13 @@ namespace libyuv { extern "C" { #endif -#define ARRAY_SIZE(x) (int)(sizeof(x) / sizeof(x[0])) - struct FourCCAliasEntry { - uint32 alias; - uint32 canonical; + uint32_t alias; + uint32_t canonical; }; -static const struct FourCCAliasEntry kFourCCAliases[] = { +#define NUM_ALIASES 18 +static const struct FourCCAliasEntry kFourCCAliases[NUM_ALIASES] = { {FOURCC_IYUV, FOURCC_I420}, {FOURCC_YU12, FOURCC_I420}, {FOURCC_YU16, FOURCC_I422}, @@ -46,9 +45,9 @@ static const struct FourCCAliasEntry kFourCCAliases[] = { // {FOURCC_BGRA, FOURCC_ARGB}, // kCMPixelFormat_32BGRA LIBYUV_API -uint32 CanonicalFourCC(uint32 fourcc) { +uint32_t CanonicalFourCC(uint32_t fourcc) { int i; - for (i = 0; i < ARRAY_SIZE(kFourCCAliases); ++i) { + for (i = 0; i < NUM_ALIASES; ++i) { if (kFourCCAliases[i].alias == fourcc) { return kFourCCAliases[i].canonical; } |