diff options
| author | Hendrik Dahlkamp <hendrik@google.com> | 2013-01-23 18:27:37 -0800 |
|---|---|---|
| committer | Adam Hampson <ahampson@google.com> | 2013-01-28 15:39:41 -0800 |
| commit | 33cfdeb7b267ab635413797fffb046b73272f7ec (patch) | |
| tree | 8ff16b765a83ba911233a1d7bfa27cce9cee3b7c /files/source/video_common.cc | |
| parent | a88a10a6ed9f9801852929bac34bdf10510116f4 (diff) | |
| download | libyuv-33cfdeb7b267ab635413797fffb046b73272f7ec.tar.gz | |
Update libyuv to r397
Change-Id: I70f5a527de52ae8ae80b189873c9a094035dfa2c
Signed-off-by: Hendrik Dahlkamp <hendrik@google.com>
Diffstat (limited to 'files/source/video_common.cc')
| -rw-r--r-- | files/source/video_common.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/files/source/video_common.cc b/files/source/video_common.cc index 8b8ee622..616affd1 100644 --- a/files/source/video_common.cc +++ b/files/source/video_common.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The LibYuv project authors. All Rights Reserved. + * Copyright 2011 The LibYuv Project Authors. All rights reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -9,13 +9,14 @@ */ -#include "video_common.h" - -#include <sstream> +#include "libyuv/video_common.h" +#ifdef __cplusplus namespace libyuv { +extern "C" { +#endif -#define ARRAY_SIZE(x) (static_cast<int>((sizeof(x)/sizeof(x[0])))) +#define ARRAY_SIZE(x) (static_cast<int>((sizeof(x) / sizeof(x[0])))) struct FourCCAliasEntry { uint32 alias; @@ -24,7 +25,8 @@ struct FourCCAliasEntry { static const FourCCAliasEntry kFourCCAliases[] = { {FOURCC_IYUV, FOURCC_I420}, - {FOURCC_YU12, FOURCC_I420}, + {FOURCC_YU16, FOURCC_I422}, + {FOURCC_YU24, FOURCC_I444}, {FOURCC_YUYV, FOURCC_YUY2}, {FOURCC_YUVS, FOURCC_YUY2}, {FOURCC_HDYC, FOURCC_UYVY}, @@ -35,6 +37,7 @@ static const FourCCAliasEntry kFourCCAliases[] = { {FOURCC_BGR3, FOURCC_24BG}, }; +LIBYUV_API uint32 CanonicalFourCC(uint32 fourcc) { for (int i = 0; i < ARRAY_SIZE(kFourCCAliases); ++i) { if (kFourCCAliases[i].alias == fourcc) { @@ -45,4 +48,8 @@ uint32 CanonicalFourCC(uint32 fourcc) { return fourcc; } +#ifdef __cplusplus +} // extern "C" } // namespace libyuv +#endif + |