From dc28e3ffd89faa7cf1a38ca63084685186534108 Mon Sep 17 00:00:00 2001 From: hbos Date: Fri, 13 Nov 2015 06:43:51 -0800 Subject: [PATCH] Preparation work for third_party/openh264 build-from-src CL This CL reverts the parts of https://codereview.chromium.org/1394983003/ that added dummy unittest binaries for openh264. This was decided to be a bad move (overhead of binaries, only wanting the tests if flag is set). The unittests will be placed and implemented in content_unittests instead in a follow-up CL. This CL also pulls in openh264/src source code. The building of this and test code will be added in a follow-up CL. BUG=500605, 468365 Review URL: https://codereview.chromium.org/1438553002 Cr-Commit-Position: refs/heads/master@{#359548} --- .gitignore | 1 + BUILD.gn | 1 - DEPS | 3 +++ build/all.gyp | 1 - build/gn_migration.gypi | 1 - third_party/openh264/LICENSE | 23 ------------------- third_party/openh264/OWNERS | 1 + third_party/openh264/README.chromium | 5 +--- third_party/openh264/tests/BUILD.gn | 20 ---------------- .../openh264/tests/openh264_unittests.cc | 20 ---------------- .../openh264/tests/openh264_unittests.gyp | 22 ------------------ tools/checklicenses/checklicenses.py | 4 ++++ 12 files changed, 10 insertions(+), 92 deletions(-) delete mode 100644 third_party/openh264/LICENSE delete mode 100644 third_party/openh264/tests/BUILD.gn delete mode 100644 third_party/openh264/tests/openh264_unittests.cc delete mode 100644 third_party/openh264/tests/openh264_unittests.gyp diff --git a/.gitignore b/.gitignore index efe521358fac5c..d9e4cba3f880c8 100644 --- a/.gitignore +++ b/.gitignore @@ -367,6 +367,7 @@ v8.log /third_party/nss /third_party/omaha/src/omaha /third_party/openmax_dl/ +/third_party/openh264/src /third_party/opus/src /third_party/pdfsqueeze /third_party/pdfium diff --git a/BUILD.gn b/BUILD.gn index 9eec119a013632..2beb66263d6ea3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -72,7 +72,6 @@ group("both_gn_and_gyp") { "//skia:skia_unittests", "//sql:sql_unittests", "//sync:sync_unit_tests", - "//third_party/openh264/tests:openh264_unittests", "//ui/base:ui_base_unittests", "//ui/gfx:gfx_unittests", "//url:url_unittests", diff --git a/DEPS b/DEPS index 221ef23c188dab..2f3b9c3752b47c 100644 --- a/DEPS +++ b/DEPS @@ -275,6 +275,9 @@ deps = { 'src/third_party/catapult': Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + '704c40202baaeb9484af0622aedf41c4a48e0df2', + + 'src/third_party/openh264/src': + Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + 'b37cda248234162033e3e11b0335f3131cdfe488', } diff --git a/build/all.gyp b/build/all.gyp index 196529d407b2a6..ecbe935d7d2f4e 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -30,7 +30,6 @@ '../testing/gtest.gyp:*', '../third_party/icu/icu.gyp:*', '../third_party/libxml/libxml.gyp:*', - '../third_party/openh264/tests/openh264_unittests.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../ui/accessibility/accessibility.gyp:*', diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index c0f55d24a61a5f..a9555ab704598d 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -82,7 +82,6 @@ '../third_party/WebKit/Source/wtf/wtf_tests.gyp:wtf_unittests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', - '../third_party/openh264/tests/openh264_unittests.gyp:*', '../third_party/smhasher/smhasher.gyp:pmurhash', '../tools/battor_agent/battor_agent.gyp:battor_agent', '../tools/telemetry/telemetry.gyp:bitmaptools#host', diff --git a/third_party/openh264/LICENSE b/third_party/openh264/LICENSE deleted file mode 100644 index 8e730c4e2c646c..00000000000000 --- a/third_party/openh264/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 2013, Cisco Systems -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, this - list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/third_party/openh264/OWNERS b/third_party/openh264/OWNERS index 88f08e9a8120ba..7187271ae5bd21 100644 --- a/third_party/openh264/OWNERS +++ b/third_party/openh264/OWNERS @@ -1 +1,2 @@ hbos@chromium.org +mflodman@chromium.org diff --git a/third_party/openh264/README.chromium b/third_party/openh264/README.chromium index 4e1893b8617c3c..d7e92f8f75f973 100644 --- a/third_party/openh264/README.chromium +++ b/third_party/openh264/README.chromium @@ -3,7 +3,7 @@ Short Name: openh264 URL: http://www.openh264.org/ Version: v.1.4.0 License: 2-Clause BSD -License File: LICENSE +License File: src/LICENSE Security Critical: yes Description: @@ -15,6 +15,3 @@ Cisco's H.264 video codec implementation. Local Modifications: N/A - - Note: OpenH264 src has not yet been pulled in. A proper README.chromium file - was added anyway due to presubmit check. diff --git a/third_party/openh264/tests/BUILD.gn b/third_party/openh264/tests/BUILD.gn deleted file mode 100644 index 5441a99a393fd9..00000000000000 --- a/third_party/openh264/tests/BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2015 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. - -import("//testing/test.gni") - -test("openh264_unittests") { - include_dirs = [ - "//", - "//third_party", - ] - - deps = [ - "//testing/gtest", - ] - - sources = [ - "openh264_unittests.cc", - ] -} diff --git a/third_party/openh264/tests/openh264_unittests.cc b/third_party/openh264/tests/openh264_unittests.cc deleted file mode 100644 index 443d27fef66530..00000000000000 --- a/third_party/openh264/tests/openh264_unittests.cc +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 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. - -#include "testing/gtest/include/gtest/gtest.h" - -namespace openh264 { - -class OpenH264Tests : public testing::Test { -}; - -TEST_F(OpenH264Tests, DummyTestAlwaysPass) { -} - -} // namespace openh264 - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/third_party/openh264/tests/openh264_unittests.gyp b/third_party/openh264/tests/openh264_unittests.gyp deleted file mode 100644 index 72143a316b5c04..00000000000000 --- a/third_party/openh264/tests/openh264_unittests.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - 'target_name': 'openh264_unittests', - 'type': '<(gtest_target_type)', - 'include_dirs': [ - '<(DEPTH)', - '<(DEPTH)/third_party', - ], - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'openh264_unittests.cc', - ], - }, - ], -} diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index fe08d7068dc80e..8051f3da885981 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -458,6 +458,10 @@ def PrintUsage(): 'third_party/modp_b64': [ 'UNKNOWN', ], + # Missing license headers in openh264 sources: https://github.com/cisco/openh264/issues/2233 + 'third_party/openh264/src': [ + 'UNKNOWN', + ], 'third_party/openmax_dl/dl' : [ 'Khronos Group', ],