Skip to content

Commit c4aa5cc

Browse files
mnegyokruAllan Sandfeld Jensen
authored andcommitted
Fix building with system libvpx
Disable code path which depends on internal api. According to the upstream change it is only needed for logging. See https://crrev.com/c/chromium/src/+/5116580 Fixes: QTBUG-129955 Change-Id: I5f396fcd8b22402af71a9e557f9f2f7f177a8114 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/617894 Reviewed-by: Allan Sandfeld Jensen <[email protected]> Reviewed-by: Moss Heim <[email protected]> (cherry picked from commit 30e6fcc) Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/621129 Reviewed-by: Qt Cherry-pick Bot <[email protected]>
1 parent 1d2b1ee commit c4aa5cc

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

chromium/media/base/libvpx_thread_wrapper.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@
55
#include "media/base/libvpx_thread_wrapper.h"
66

77
#include "media/base/codec_worker_impl.h"
8+
#if !BUILDFLAG(IS_QTWEBENGINE) || !defined(USE_SYSTEM_LIBVPX)
89
#include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h"
10+
#endif
911

1012
namespace media {
1113

1214
void InitLibVpxThreadWrapper() {
15+
#if !BUILDFLAG(IS_QTWEBENGINE) || !defined(USE_SYSTEM_LIBVPX)
1316
const VPxWorkerInterface interface =
1417
CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker,
1518
VPxWorkerStatus, VPX_WORKER_STATUS_NOT_OK,
1619
VPX_WORKER_STATUS_OK,
1720
VPX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
1821

1922
CHECK(vpx_set_worker_interface(&interface));
23+
#endif
2024
}
2125

2226
} // namespace media

chromium/third_party/libvpx/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ static_library("bundled_libvpxrc") {
634634
if (use_system_libvpx) {
635635
pkg_config("system_libvpx") {
636636
packages = [ "vpx" ]
637+
defines = ["USE_SYSTEM_LIBVPX=true"]
637638
}
638639
}
639640

0 commit comments

Comments
 (0)