diff options
author | johannkoenig <johannkoenig@google.com> | 2015-09-18 15:35:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 22:35:55 +0000 |
commit | 5238138a422157576799266228c0c9ee174936ae (patch) | |
tree | a112597714c67c981610341f2415456b5f13e63d /media/cast | |
parent | baab86ff3d07870373266e101b0cf8916d4af188 (diff) | |
download | chromium_src-5238138a422157576799266228c0c9ee174936ae.zip chromium_src-5238138a422157576799266228c0c9ee174936ae.tar.gz chromium_src-5238138a422157576799266228c0c9ee174936ae.tar.bz2 |
Copy libvpx from DEPS to src
Leaves the previous version in place but updates BUILD.gn and libvpx.gn to point to the new version. This allows decoupling the WebRTC update which is also in DEPS.
libvpx DEPS changes ac1772e:0d6551
https://codereview.chromium.org/1339033002
https://chromium-review.googlesource.com/299759
https://codereview.chromium.org/1350853003
https://codereview.chromium.org/1353433003
Copy directory to libvpx_new to avoid breaking bisecting. This allows the user to move between and older and newer revision. A followup to rename libvpx_new to libvpx will come in some ~months because there are additional complications if one tries to sync directly from pre-move to post-rename or the other way around.
Remove WATCHLISTS and codereview.settings from _new and use the parent versions.
Add DEPS file to enumerate the #include paths.
Check out third_party/libvpx_new/source/libvpx directly from upstream project
Update all the easy clients of libvpx to depend on the new tree directly.
https://chromium.googlesource.com/chromium/deps/libvpx/+/ac1772e3db5c885b554f6a72ca9dbac4245cb0e2
BUG=481034
R=tomfinegan@chromium.org,brettw@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1323333002
Cr-Commit-Position: refs/heads/master@{#349789}
Diffstat (limited to 'media/cast')
-rw-r--r-- | media/cast/BUILD.gn | 8 | ||||
-rw-r--r-- | media/cast/cast.gyp | 8 | ||||
-rw-r--r-- | media/cast/receiver/video_decoder.cc | 4 | ||||
-rw-r--r-- | media/cast/sender/vp8_encoder.cc | 2 | ||||
-rw-r--r-- | media/cast/sender/vp8_encoder.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn index 1505436..61452ea 100644 --- a/media/cast/BUILD.gn +++ b/media/cast/BUILD.gn @@ -144,7 +144,7 @@ source_set("sender") { ":net", "//media", "//media:shared_memory_support", - "//third_party/libvpx", + "//third_party/libvpx_new", "//third_party/opus", "//ui/gfx/geometry", ] @@ -154,7 +154,7 @@ source_set("sender") { deps += [ "//media:media_for_cast_ios" ] deps -= [ "//media", - "//third_party/libvpx", + "//third_party/libvpx_new", "//third_party/opus", ] sources -= [ @@ -201,7 +201,7 @@ source_set("receiver") { ":net", "//media", "//media:shared_memory_support", - "//third_party/libvpx", + "//third_party/libvpx_new", "//third_party/opus", "//ui/gfx", ] @@ -211,7 +211,7 @@ source_set("receiver") { deps += [ "//media:media_for_cast_ios" ] deps -= [ "//media", - "//third_party/libvpx", + "//third_party/libvpx_new", "//third_party/opus", ] } diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp index 71ba2f0..044ad2d 100644 --- a/media/cast/cast.gyp +++ b/media/cast/cast.gyp @@ -94,7 +94,7 @@ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/media/media.gyp:shared_memory_support', '<(DEPTH)/third_party/opus/opus.gyp:opus', - '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', + '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', ], 'sources': [ @@ -125,7 +125,7 @@ 'dependencies!': [ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/third_party/opus/opus.gyp:opus', - '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', + '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new', ], }], # OS=="ios" ], # conditions @@ -143,7 +143,7 @@ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/media/media.gyp:shared_memory_support', '<(DEPTH)/third_party/opus/opus.gyp:opus', - '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', + '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', ], # dependencies 'sources': [ @@ -186,7 +186,7 @@ 'dependencies!': [ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/third_party/opus/opus.gyp:opus', - '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', + '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new', ], 'sources!': [ 'sender/external_video_encoder.cc', diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc index 5c87233..f9b24a420 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -16,8 +16,8 @@ // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide // backwards compatibility for legacy applications using the library. #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" -#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" +#include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h" +#include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h" #include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/cast/sender/vp8_encoder.cc b/media/cast/sender/vp8_encoder.cc index 97139e8..7bb2f11 100644 --- a/media/cast/sender/vp8_encoder.cc +++ b/media/cast/sender/vp8_encoder.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "media/base/video_frame.h" #include "media/cast/cast_defines.h" -#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx_new/source/libvpx/vpx/vp8cx.h" namespace media { namespace cast { diff --git a/media/cast/sender/vp8_encoder.h b/media/cast/sender/vp8_encoder.h index fe2c54c..8888097 100644 --- a/media/cast/sender/vp8_encoder.h +++ b/media/cast/sender/vp8_encoder.h @@ -10,7 +10,7 @@ #include "base/threading/thread_checker.h" #include "media/cast/cast_config.h" #include "media/cast/sender/software_video_encoder.h" -#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx_new/source/libvpx/vpx/vpx_encoder.h" #include "ui/gfx/geometry/size.h" namespace media { |