diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 05:28:55 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 05:28:55 +0000 |
commit | 15410fc638e0123a18ed932541477b2dc2b648ef (patch) | |
tree | 1e60261c8f7278a7b9e34ef457cf715367f99832 /third_party/libwebm | |
parent | bf9b756448cb4dc4f77ddc348403d50267950127 (diff) | |
download | chromium_src-15410fc638e0123a18ed932541477b2dc2b648ef.zip chromium_src-15410fc638e0123a18ed932541477b2dc2b648ef.tar.gz chromium_src-15410fc638e0123a18ed932541477b2dc2b648ef.tar.bz2 |
Add libwebm in third_party.
libwebm will be used by chromoting client to generate WebM stream for
MediaSource API.
BUG=321825
Review URL: https://codereview.chromium.org/134643003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libwebm')
-rw-r--r-- | third_party/libwebm/OWNERS | 2 | ||||
-rw-r--r-- | third_party/libwebm/README.chromium | 13 | ||||
-rw-r--r-- | third_party/libwebm/libwebm.gyp | 18 | ||||
-rw-r--r-- | third_party/libwebm/libwebm.gypi | 45 | ||||
-rw-r--r-- | third_party/libwebm/libwebm_nacl.gyp | 28 |
5 files changed, 106 insertions, 0 deletions
diff --git a/third_party/libwebm/OWNERS b/third_party/libwebm/OWNERS new file mode 100644 index 0000000..8af0345 --- /dev/null +++ b/third_party/libwebm/OWNERS @@ -0,0 +1,2 @@ +sergeyu@chromium.org +tomfinegan@chromium.org diff --git a/third_party/libwebm/README.chromium b/third_party/libwebm/README.chromium new file mode 100644 index 0000000..bc341cd --- /dev/null +++ b/third_party/libwebm/README.chromium @@ -0,0 +1,13 @@ +Name: WebM container parser and writer. +Short Name: libwebm +URL: http://www.webmproject.org/code/ +Version: unknown +License: BSD +License File: source/LICENSE.TXT +Security Critical: No + +Description: +libwebm is a library to read and write WebM files. It's used in Chrome Remote +Desktop to generate WebM stream that can be fed to the MedisSource API. It's +_not_ used in Chrome to parse WebM files (there is a separate parser in +src/media). diff --git a/third_party/libwebm/libwebm.gyp b/third_party/libwebm/libwebm.gyp new file mode 100644 index 0000000..e277407 --- /dev/null +++ b/third_party/libwebm/libwebm.gyp @@ -0,0 +1,18 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'includes': [ + 'libwebm.gypi', + ], + 'targets': [ + { + 'target_name': 'libwebm', + 'type': 'static_library', + 'sources': [ + '<@(libwebm_sources)' + ] + }, # target libwebm + ] +} diff --git a/third_party/libwebm/libwebm.gypi b/third_party/libwebm/libwebm.gypi new file mode 100644 index 0000000..7a82dec --- /dev/null +++ b/third_party/libwebm/libwebm.gypi @@ -0,0 +1,45 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'libwebm_sources': [ + 'source/mkvmuxer.cpp', + 'source/mkvmuxerutil.cpp', + 'source/mkvwriter.cpp', + ], + } +} + +if (is_android) { + arm_use_neon = false + # Our version of arm_neon_optional from common.gypi. This is not used in the + # current build so is commented out for now. + #arm_optionally_use_neon = false +} else { + arm_use_neon = true + #arm_optionally_use_neon = true +} + +if (arm_version == 6) { + arm_arch = "armv6" + arm_tune = "" + arm_float_abi = "softfp" + arm_fpu = "vfp" + # Thumb is a reduced instruction set available on some ARM processors that + # has increased code density. + arm_use_thumb = false + +} else if (arm_version == 7) { + arm_arch = "armv7-a" + arm_tune = "cortex-a8" + arm_float_abi = "softfp" + arm_use_thumb = true + + if (arm_use_neon) { + arm_fpu = "neon" + } else { + arm_fpu = "vfpv3-d16" + } +} diff --git a/third_party/libwebm/libwebm_nacl.gyp b/third_party/libwebm/libwebm_nacl.gyp new file mode 100644 index 0000000..adec08f --- /dev/null +++ b/third_party/libwebm/libwebm_nacl.gyp @@ -0,0 +1,28 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'includes': [ + 'libwebm.gypi', + '../../native_client/build/untrusted.gypi', + ], + 'targets': [ + { + 'target_name': 'libwebm_nacl', + 'type': 'none', + 'variables': { + 'nlib_target': 'libwebm_nacl.a', + 'build_glibc': 0, + 'build_newlib': 0, + 'build_pnacl_newlib': 1, + }, + 'dependencies': [ + '../../native_client/tools.gyp:prep_toolchain', + ], + 'sources': [ + '<@(libwebm_sources)', + ], + }, # target libwebm_nacl + ] +} |