author | Randell Jesup <rjesup@jesup.org> |
Thu, 30 Jan 2014 19:55:04 -0500 | |
changeset 166825 | f9315e1a38447e5f62ed9ff64470397252fcbc1f |
parent 166824 | ccee696962b99445e37c32c94aff0267ab47caa6 |
child 166826 | 0930352a2b0e04285d5d876566ce34e419152e74 |
push id | 26152 |
push user | cbook@mozilla.com |
push date | Wed, 05 Feb 2014 12:20:14 +0000 |
treeherder | mozilla-central@8f7033c595b9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 813645 |
milestone | 30.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/build/gyp.mozbuild +++ b/build/gyp.mozbuild @@ -17,16 +17,19 @@ gyp_vars = { 'enable_protobuf': 0, 'include_tests': 0, 'enable_android_opensl': 1, # use_system_lib* still seems to be in use in trunk/build 'use_system_libjpeg': 0, 'use_system_libvpx': 0, 'build_libjpeg': 0, 'build_libvpx': 0, + 'build_libyuv': 0, + 'libyuv_dir': '/media/libyuv', + # saves 4MB when webrtc_trace is off 'enable_lazy_trace_alloc': 1, # turn off mandatory use of NEON and instead use NEON detection 'arm_neon': 0, 'moz_widget_toolkit_gonk': 0,
rename from media/webrtc/trunk/third_party/libyuv/LICENSE_THIRD_PARTY rename to media/libyuv/LICENSE_THIRD_PARTY
rename from media/webrtc/trunk/third_party/libyuv/README.chromium rename to media/libyuv/README.chromium
rename from media/webrtc/trunk/third_party/libyuv/codereview.settings rename to media/libyuv/codereview.settings
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv.h rename to media/libyuv/include/libyuv.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h rename to media/libyuv/include/libyuv/basic_types.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/compare.h rename to media/libyuv/include/libyuv/compare.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/convert.h rename to media/libyuv/include/libyuv/convert.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/convert_argb.h rename to media/libyuv/include/libyuv/convert_argb.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/convert_from.h rename to media/libyuv/include/libyuv/convert_from.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/convert_from_argb.h rename to media/libyuv/include/libyuv/convert_from_argb.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/cpu_id.h rename to media/libyuv/include/libyuv/cpu_id.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/format_conversion.h rename to media/libyuv/include/libyuv/format_conversion.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/mjpeg_decoder.h rename to media/libyuv/include/libyuv/mjpeg_decoder.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/planar_functions.h rename to media/libyuv/include/libyuv/planar_functions.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/rotate.h rename to media/libyuv/include/libyuv/rotate.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/rotate_argb.h rename to media/libyuv/include/libyuv/rotate_argb.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/row.h rename to media/libyuv/include/libyuv/row.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/scale.h rename to media/libyuv/include/libyuv/scale.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/scale_argb.h rename to media/libyuv/include/libyuv/scale_argb.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/scale_row.h rename to media/libyuv/include/libyuv/scale_row.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/version.h rename to media/libyuv/include/libyuv/version.h
rename from media/webrtc/trunk/third_party/libyuv/include/libyuv/video_common.h rename to media/libyuv/include/libyuv/video_common.h
rename from media/webrtc/trunk/third_party/libyuv/libyuv_nacl.gyp rename to media/libyuv/libyuv_nacl.gyp
rename from media/webrtc/trunk/third_party/libyuv/libyuv_test.gyp rename to media/libyuv/libyuv_test.gyp
new file mode 100644 --- /dev/null +++ b/media/libyuv/moz.build @@ -0,0 +1,22 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +include('/build/gyp.mozbuild') + +GYP_DIRS += ['.'] + +libyuv_non_unified_sources = [ + 'source/convert.cc', + 'source/convert_from.cc', + 'source/row_common.cc', + 'source/scale.cc', + 'source/scale_common.cc', +] +GYP_DIRS['.'].input = 'libyuv.gyp' +GYP_DIRS['.'].variables = gyp_vars +GYP_DIRS['.'].sandbox_vars['FINAL_LIBRARY'] = 'xul' +GYP_DIRS['.'].non_unified_sources += libyuv_non_unified_sources +
rename from media/webrtc/trunk/third_party/libyuv/source/compare.cc rename to media/libyuv/source/compare.cc
rename from media/webrtc/trunk/third_party/libyuv/source/compare_common.cc rename to media/libyuv/source/compare_common.cc
rename from media/webrtc/trunk/third_party/libyuv/source/compare_neon.cc rename to media/libyuv/source/compare_neon.cc
rename from media/webrtc/trunk/third_party/libyuv/source/compare_posix.cc rename to media/libyuv/source/compare_posix.cc
rename from media/webrtc/trunk/third_party/libyuv/source/compare_win.cc rename to media/libyuv/source/compare_win.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert.cc rename to media/libyuv/source/convert.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert_argb.cc rename to media/libyuv/source/convert_argb.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert_from.cc rename to media/libyuv/source/convert_from.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert_from_argb.cc rename to media/libyuv/source/convert_from_argb.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert_jpeg.cc rename to media/libyuv/source/convert_jpeg.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert_to_argb.cc rename to media/libyuv/source/convert_to_argb.cc
rename from media/webrtc/trunk/third_party/libyuv/source/convert_to_i420.cc rename to media/libyuv/source/convert_to_i420.cc
rename from media/webrtc/trunk/third_party/libyuv/source/cpu_id.cc rename to media/libyuv/source/cpu_id.cc
rename from media/webrtc/trunk/third_party/libyuv/source/format_conversion.cc rename to media/libyuv/source/format_conversion.cc
rename from media/webrtc/trunk/third_party/libyuv/source/mjpeg_decoder.cc rename to media/libyuv/source/mjpeg_decoder.cc
rename from media/webrtc/trunk/third_party/libyuv/source/mjpeg_validate.cc rename to media/libyuv/source/mjpeg_validate.cc
rename from media/webrtc/trunk/third_party/libyuv/source/planar_functions.cc rename to media/libyuv/source/planar_functions.cc
rename from media/webrtc/trunk/third_party/libyuv/source/rotate.cc rename to media/libyuv/source/rotate.cc
rename from media/webrtc/trunk/third_party/libyuv/source/rotate_argb.cc rename to media/libyuv/source/rotate_argb.cc
rename from media/webrtc/trunk/third_party/libyuv/source/rotate_mips.cc rename to media/libyuv/source/rotate_mips.cc
rename from media/webrtc/trunk/third_party/libyuv/source/rotate_neon.cc rename to media/libyuv/source/rotate_neon.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_any.cc rename to media/libyuv/source/row_any.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_common.cc rename to media/libyuv/source/row_common.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_mips.cc rename to media/libyuv/source/row_mips.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_neon.cc rename to media/libyuv/source/row_neon.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_posix.cc rename to media/libyuv/source/row_posix.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_win.cc rename to media/libyuv/source/row_win.cc
rename from media/webrtc/trunk/third_party/libyuv/source/row_x86.asm rename to media/libyuv/source/row_x86.asm
rename from media/webrtc/trunk/third_party/libyuv/source/scale.cc rename to media/libyuv/source/scale.cc
rename from media/webrtc/trunk/third_party/libyuv/source/scale_argb.cc rename to media/libyuv/source/scale_argb.cc
rename from media/webrtc/trunk/third_party/libyuv/source/scale_common.cc rename to media/libyuv/source/scale_common.cc
rename from media/webrtc/trunk/third_party/libyuv/source/scale_mips.cc rename to media/libyuv/source/scale_mips.cc
rename from media/webrtc/trunk/third_party/libyuv/source/scale_neon.cc rename to media/libyuv/source/scale_neon.cc
rename from media/webrtc/trunk/third_party/libyuv/source/scale_posix.cc rename to media/libyuv/source/scale_posix.cc
rename from media/webrtc/trunk/third_party/libyuv/source/scale_win.cc rename to media/libyuv/source/scale_win.cc
rename from media/webrtc/trunk/third_party/libyuv/source/video_common.cc rename to media/libyuv/source/video_common.cc
rename from media/webrtc/trunk/third_party/libyuv/source/x86inc.asm rename to media/libyuv/source/x86inc.asm
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/libyuv_tests.bat rename to media/libyuv/tools/valgrind-libyuv/libyuv_tests.bat
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/libyuv_tests.py rename to media/libyuv/tools/valgrind-libyuv/libyuv_tests.py
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/libyuv_tests.sh rename to media/libyuv/tools/valgrind-libyuv/libyuv_tests.sh
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/OWNERS rename to media/libyuv/tools/valgrind-libyuv/memcheck/OWNERS
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/PRESUBMIT.py rename to media/libyuv/tools/valgrind-libyuv/memcheck/PRESUBMIT.py
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/suppressions.txt rename to media/libyuv/tools/valgrind-libyuv/memcheck/suppressions.txt
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/suppressions_mac.txt rename to media/libyuv/tools/valgrind-libyuv/memcheck/suppressions_mac.txt
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/suppressions_win32.txt rename to media/libyuv/tools/valgrind-libyuv/memcheck/suppressions_win32.txt
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/OWNERS rename to media/libyuv/tools/valgrind-libyuv/tsan/OWNERS
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/PRESUBMIT.py rename to media/libyuv/tools/valgrind-libyuv/tsan/PRESUBMIT.py
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/suppressions.txt rename to media/libyuv/tools/valgrind-libyuv/tsan/suppressions.txt
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/suppressions_mac.txt rename to media/libyuv/tools/valgrind-libyuv/tsan/suppressions_mac.txt
rename from media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/suppressions_win32.txt rename to media/libyuv/tools/valgrind-libyuv/tsan/suppressions_win32.txt
rename from media/webrtc/trunk/third_party/libyuv/unit_test/basictypes_test.cc rename to media/libyuv/unit_test/basictypes_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/compare_test.cc rename to media/libyuv/unit_test/compare_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/convert_test.cc rename to media/libyuv/unit_test/convert_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/cpu_test.cc rename to media/libyuv/unit_test/cpu_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/math_test.cc rename to media/libyuv/unit_test/math_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/planar_test.cc rename to media/libyuv/unit_test/planar_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/rotate_argb_test.cc rename to media/libyuv/unit_test/rotate_argb_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/rotate_test.cc rename to media/libyuv/unit_test/rotate_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/scale_argb_test.cc rename to media/libyuv/unit_test/scale_argb_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/scale_test.cc rename to media/libyuv/unit_test/scale_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/testdata/arm_v7.txt rename to media/libyuv/unit_test/testdata/arm_v7.txt
rename from media/webrtc/trunk/third_party/libyuv/unit_test/testdata/tegra3.txt rename to media/libyuv/unit_test/testdata/tegra3.txt
rename from media/webrtc/trunk/third_party/libyuv/unit_test/unit_test.cc rename to media/libyuv/unit_test/unit_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/unit_test.h rename to media/libyuv/unit_test/unit_test.h
rename from media/webrtc/trunk/third_party/libyuv/unit_test/version_test.cc rename to media/libyuv/unit_test/version_test.cc
rename from media/webrtc/trunk/third_party/libyuv/unit_test/video_common_test.cc rename to media/libyuv/unit_test/video_common_test.cc
rename from media/webrtc/trunk/third_party/libyuv/util/Makefile rename to media/libyuv/util/Makefile
rename from media/webrtc/trunk/third_party/libyuv/util/compare.cc rename to media/libyuv/util/compare.cc
rename from media/webrtc/trunk/third_party/libyuv/util/convert.cc rename to media/libyuv/util/convert.cc
rename from media/webrtc/trunk/third_party/libyuv/util/psnr_main.cc rename to media/libyuv/util/psnr_main.cc
--- a/media/webrtc/signaling/signaling.gyp +++ b/media/webrtc/signaling/signaling.gyp @@ -56,17 +56,17 @@ '../../../dom/base', '../../../content/media', '../../../media/mtransport', '../trunk', '../trunk/webrtc/video_engine/include', '../trunk/webrtc/voice_engine/include', '../trunk/webrtc/modules/interface', '../trunk/webrtc/peerconnection', - '../trunk/third_party/libyuv/include/', + '../../libyuv/include', '../../../netwerk/srtp/src/include', '../../../netwerk/srtp/src/crypto/include', '../../../ipc/chromium/src', ], # # DEPENDENCIES #
--- a/media/webrtc/signaling/test/Makefile.in +++ b/media/webrtc/signaling/test/Makefile.in @@ -9,16 +9,17 @@ LIBS = \ $(REALTIME_LIBS) \ $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ $(DEPTH)/layout/media/webrtc/$(LIB_PREFIX)webrtc.$(LIB_SUFFIX) \ $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ + $(DEPTH)/media/libyuv/libyuv_libyuv/$(LIB_PREFIX)yuv.$(LIB_SUFFIX) \ $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ $(NULL) ifdef JS_SHARED_LIBRARY LIBS += $(MOZ_JS_LIBS) endif ifdef MOZ_ALSA
--- a/media/webrtc/trunk/peerconnection.gyp +++ b/media/webrtc/trunk/peerconnection.gyp @@ -34,17 +34,16 @@ }, ], 'dependencies': [ 'webrtc/modules/modules.gyp:audio_device', 'webrtc/modules/modules.gyp:video_capture_module', # 'webrtc/modules/modules.gyp:video_render_module', # 'webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', 'webrtc/video_engine/video_engine.gyp:video_engine_core', 'webrtc/voice_engine/voice_engine.gyp:voice_engine', - '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', ], }, ], ], }, ], 'conditions': [ ['build_with_mozilla==0', { 'targets': [ {
--- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -68,16 +68,17 @@ if CONFIG['MOZ_JSDEBUGGER']: add_tier_dir('platform', 'js/jsd') if CONFIG['MOZ_WEBRTC']: add_tier_dir('platform', [ 'media/webrtc', 'media/mtransport/third_party', 'media/mtransport/build', 'media/mtransport/standalone', + 'media/libyuv', ]) if CONFIG['MOZ_OMX_PLUGIN']: add_tier_dir('platform', [ 'media/omx-plugin/lib/ics/libutils', 'media/omx-plugin/lib/ics/libstagefright', 'media/omx-plugin/lib/ics/libvideoeditorplayer', 'media/omx-plugin/lib/gb/libutils',