Skip to content

Commit

Permalink
Add libwebm in third_party.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sergeyu@chromium.org committed Jan 16, 2014
1 parent bf9b756 commit 15410fc
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 0 deletions.
4 changes: 4 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,10 @@ deps = {
"src/third_party/html_office":
Var("chromium_git") +
"/chromium/html-office-public.git@1d04f3dfbd8bd604190dfb6f5a030d30233ba6ea",

"src/third_party/libwebm/source":
Var("chromium_git") +
"/webm/libwebm.git@5efd6e3c1df766c08294ad19168e71522ee0d808",
}


Expand Down
2 changes: 2 additions & 0 deletions third_party/libwebm/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sergeyu@chromium.org
tomfinegan@chromium.org
13 changes: 13 additions & 0 deletions third_party/libwebm/README.chromium
Original file line number Diff line number Diff line change
@@ -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).
18 changes: 18 additions & 0 deletions third_party/libwebm/libwebm.gyp
Original file line number Diff line number Diff line change
@@ -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
]
}
45 changes: 45 additions & 0 deletions third_party/libwebm/libwebm.gypi
Original file line number Diff line number Diff line change
@@ -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"
}
}
28 changes: 28 additions & 0 deletions third_party/libwebm/libwebm_nacl.gyp
Original file line number Diff line number Diff line change
@@ -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
]
}

0 comments on commit 15410fc

Please sign in to comment.