diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:53:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:53:33 +0100 |
| commit | c5e87ee96ec90d065ddcc7c5cfd400bfdd72889b (patch) | |
| tree | 9cfe0a13fe9ba922f8278ef8e365508b070c2313 | |
| parent | 688977caf297e1b1cecf977b9680219793fcaf64 (diff) | |
| parent | 5c28a0a23c4b04c44d7b1a5db4903f4e5ee18ff9 (diff) | |
| download | webrtc-c5e87ee96ec90d065ddcc7c5cfd400bfdd72889b.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I024c837265c4aa34ce7b896a9d3ad9d41767bae0
690 files changed, 8137 insertions, 2633 deletions
@@ -1,3 +1,4 @@ +per-file *.isolate=kjellander@webrtc.org # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/base/OWNERS b/base/OWNERS new file mode 100644 index 00000000..4091a93d --- /dev/null +++ b/base/OWNERS @@ -0,0 +1,7 @@ +henrike@webrtc.org +pwestin@webrtc.org +perkj@webrtc.org +henrika@webrtc.org +henrikg@webrtc.org +mflodman@webrtc.org +niklas.enbom@webrtc.org
\ No newline at end of file diff --git a/base/base.gyp b/base/base.gyp index 9e6f2e41..5cb1fd9b 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -40,6 +40,7 @@ 'asynchttprequest.h', 'asyncinvoker.cc', 'asyncinvoker.h', + 'asyncinvoker-inl.h', 'asyncpacketsocket.h', 'asyncresolverinterface.h', 'asyncsocket.cc', @@ -58,11 +59,13 @@ 'basicdefs.h', 'basictypes.h', 'bind.h', + 'bind.h.pump', 'buffer.h', 'bytebuffer.cc', 'bytebuffer.h', 'byteorder.h', 'callback.h', + 'callback.h.pump', 'checks.cc', 'checks.h', 'common.cc', @@ -113,12 +116,15 @@ 'json.cc', 'json.h', 'latebindingsymboltable.cc', + 'latebindingsymboltable.cc.def', 'latebindingsymboltable.h', + 'latebindingsymboltable.h.def', 'libdbusglibsymboltable.cc', 'libdbusglibsymboltable.h', 'linux.cc', 'linux.h', 'linuxfdwalk.c', + 'linuxfdwalk.h', 'linuxwindowpicker.cc', 'linuxwindowpicker.h', 'linked_ptr.h', @@ -197,6 +203,8 @@ 'refcount.h', 'referencecountedsingletonfactory.h', 'rollingaccumulator.h', + 'safe_conversions.h', + 'safe_conversions_impl.h', 'schanneladapter.cc', 'schanneladapter.h', 'scoped_autorelease_pool.h', @@ -260,6 +268,9 @@ 'testclient.h', 'thread.cc', 'thread.h', + 'thread_checker.h', + 'thread_checker_impl.cc', + 'thread_checker_impl.h', 'timeutils.cc', 'timeutils.h', 'timing.cc', @@ -351,10 +362,6 @@ 'dbus.h', 'diskcache_win32.cc', 'diskcache_win32.h', - 'fakecpumonitor.h', - 'fakenetwork.h', - 'fakesslidentity.h', - 'faketaskrunner.h', 'filelock.cc', 'filelock.h', 'fileutils_mock.h', @@ -389,7 +396,6 @@ 'multipart.h', 'natserver.cc', 'natserver.h', - 'natserver_main.cc', 'natsocketfactory.cc', 'natsocketfactory.h', 'nattypes.cc', @@ -419,8 +425,6 @@ 'testbase64.h', 'testclient.cc', 'testclient.h', - 'testechoserver.h', - 'testutils.h', 'transformadapter.cc', 'transformadapter.h', 'versionparsing.cc', @@ -433,7 +437,6 @@ 'win32socketinit.h', 'win32socketserver.cc', 'win32socketserver.h', - 'win32toolhelp.h', 'window.h', 'windowpickerfactory.h', 'windowpicker.h', diff --git a/base/base_tests.gyp b/base/base_tests.gyp index 406c73e1..c5cc7b80 100644 --- a/base/base_tests.gyp +++ b/base/base_tests.gyp @@ -22,6 +22,7 @@ 'gunit.h', 'testbase64.h', 'testechoserver.h', + 'testutils.h', 'win32toolhelp.h', ], 'dependencies': [ @@ -83,6 +84,8 @@ 'sharedexclusivelock_unittest.cc', 'signalthread_unittest.cc', 'sigslot_unittest.cc', + 'sigslottester.h', + 'sigslottester.h.pump', 'socket_unittest.cc', 'socket_unittest.h', 'socketaddress_unittest.cc', @@ -93,6 +96,7 @@ # 'systeminfo_unittest.cc', 'task_unittest.cc', 'testclient_unittest.cc', + 'thread_checker_unittest.cc', 'thread_unittest.cc', 'timeutils_unittest.cc', 'urlencode_unittest.cc', diff --git a/base/genericslot.h b/base/genericslot.h deleted file mode 100755 index 76205b33..00000000 --- a/base/genericslot.h +++ /dev/null @@ -1,241 +0,0 @@ -// This file was GENERATED by command: -// pump.py genericslot.h.pump -// DO NOT EDIT BY HAND!!! - -/* - * Copyright 2014 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef WEBRTC_BASE_GENERICSLOT_H_ -#define WEBRTC_BASE_GENERICSLOT_H_ - -// To generate genericslot.h from genericslot.h.pump, execute: -// /home/build/google3/third_party/gtest/scripts/pump.py genericslot.h.pump - -// Generic-slots are pure slots that can be hooked up to signals. They're -// mainly intended to be used in tests where we want to check if a signal -// was invoked and what arguments were passed. NOTE: They do not do any -// lifetime management of the arguments received via callbacks. -// -// Example: -// /* Some signal */ -// sigslot::signal1<int> foo; -// -// /* We want to monitor foo in some test */ -// rtc::GenericSlot1<int> slot(&foo, 0); -// foo.emit(5); -// EXPECT_TRUE(slot.callback_received()); -// EXPECT_EQ(5, *(slot.arg1())); -// - -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" - -namespace rtc { - -template <class A1> -class GenericSlot1 : public sigslot::has_slots<> { - public: - GenericSlot1(sigslot::signal1<A1>* signal, - const A1& arg1_initial) - : arg1_initial_(arg1_initial) { - Reset(); - signal->connect(this, &GenericSlot1::OnSignalCallback); - } - - void Reset() { - callback_received_ = false; - arg1_ = arg1_initial_; - } - - bool callback_received() const { return callback_received_; } - const A1& arg1() const { return arg1_; } - - private: - void OnSignalCallback(A1 arg1) { - callback_received_ = true; - arg1_ = arg1; - } - - bool callback_received_; - A1 arg1_initial_, arg1_; - - DISALLOW_COPY_AND_ASSIGN(GenericSlot1); -}; - -template <class A1, class A2> -class GenericSlot2 : public sigslot::has_slots<> { - public: - GenericSlot2(sigslot::signal2<A1, A2>* signal, - const A1& arg1_initial, const A2& arg2_initial) - : arg1_initial_(arg1_initial), arg2_initial_(arg2_initial) { - Reset(); - signal->connect(this, &GenericSlot2::OnSignalCallback); - } - - void Reset() { - callback_received_ = false; - arg1_ = arg1_initial_; - arg2_ = arg2_initial_; - } - - bool callback_received() const { return callback_received_; } - const A1& arg1() const { return arg1_; } - const A2& arg2() const { return arg2_; } - - private: - void OnSignalCallback(A1 arg1, A2 arg2) { - callback_received_ = true; - arg1_ = arg1; - arg2_ = arg2; - } - - bool callback_received_; - A1 arg1_initial_, arg1_; - A2 arg2_initial_, arg2_; - - DISALLOW_COPY_AND_ASSIGN(GenericSlot2); -}; - -template <class A1, class A2, class A3> -class GenericSlot3 : public sigslot::has_slots<> { - public: - GenericSlot3(sigslot::signal3<A1, A2, A3>* signal, - const A1& arg1_initial, const A2& arg2_initial, - const A3& arg3_initial) - : arg1_initial_(arg1_initial), arg2_initial_(arg2_initial), - arg3_initial_(arg3_initial) { - Reset(); - signal->connect(this, &GenericSlot3::OnSignalCallback); - } - - void Reset() { - callback_received_ = false; - arg1_ = arg1_initial_; - arg2_ = arg2_initial_; - arg3_ = arg3_initial_; - } - - bool callback_received() const { return callback_received_; } - const A1& arg1() const { return arg1_; } - const A2& arg2() const { return arg2_; } - const A3& arg3() const { return arg3_; } - - private: - void OnSignalCallback(A1 arg1, A2 arg2, A3 arg3) { - callback_received_ = true; - arg1_ = arg1; - arg2_ = arg2; - arg3_ = arg3; - } - - bool callback_received_; - A1 arg1_initial_, arg1_; - A2 arg2_initial_, arg2_; - A3 arg3_initial_, arg3_; - - DISALLOW_COPY_AND_ASSIGN(GenericSlot3); -}; - -template <class A1, class A2, class A3, class A4> -class GenericSlot4 : public sigslot::has_slots<> { - public: - GenericSlot4(sigslot::signal4<A1, A2, A3, A4>* signal, - const A1& arg1_initial, const A2& arg2_initial, - const A3& arg3_initial, const A4& arg4_initial) - : arg1_initial_(arg1_initial), arg2_initial_(arg2_initial), - arg3_initial_(arg3_initial), arg4_initial_(arg4_initial) { - Reset(); - signal->connect(this, &GenericSlot4::OnSignalCallback); - } - - void Reset() { - callback_received_ = false; - arg1_ = arg1_initial_; - arg2_ = arg2_initial_; - arg3_ = arg3_initial_; - arg4_ = arg4_initial_; - } - - bool callback_received() const { return callback_received_; } - const A1& arg1() const { return arg1_; } - const A2& arg2() const { return arg2_; } - const A3& arg3() const { return arg3_; } - const A4& arg4() const { return arg4_; } - - private: - void OnSignalCallback(A1 arg1, A2 arg2, A3 arg3, A4 arg4) { - callback_received_ = true; - arg1_ = arg1; - arg2_ = arg2; - arg3_ = arg3; - arg4_ = arg4; - } - - bool callback_received_; - A1 arg1_initial_, arg1_; - A2 arg2_initial_, arg2_; - A3 arg3_initial_, arg3_; - A4 arg4_initial_, arg4_; - - DISALLOW_COPY_AND_ASSIGN(GenericSlot4); -}; - -template <class A1, class A2, class A3, class A4, class A5> -class GenericSlot5 : public sigslot::has_slots<> { - public: - GenericSlot5(sigslot::signal5<A1, A2, A3, A4, A5>* signal, - const A1& arg1_initial, const A2& arg2_initial, - const A3& arg3_initial, const A4& arg4_initial, - const A5& arg5_initial) - : arg1_initial_(arg1_initial), arg2_initial_(arg2_initial), - arg3_initial_(arg3_initial), arg4_initial_(arg4_initial), - arg5_initial_(arg5_initial) { - Reset(); - signal->connect(this, &GenericSlot5::OnSignalCallback); - } - - void Reset() { - callback_received_ = false; - arg1_ = arg1_initial_; - arg2_ = arg2_initial_; - arg3_ = arg3_initial_; - arg4_ = arg4_initial_; - arg5_ = arg5_initial_; - } - - bool callback_received() const { return callback_received_; } - const A1& arg1() const { return arg1_; } - const A2& arg2() const { return arg2_; } - const A3& arg3() const { return arg3_; } - const A4& arg4() const { return arg4_; } - const A5& arg5() const { return arg5_; } - - private: - void OnSignalCallback(A1 arg1, A2 arg2, A3 arg3, A4 arg4, A5 arg5) { - callback_received_ = true; - arg1_ = arg1; - arg2_ = arg2; - arg3_ = arg3; - arg4_ = arg4; - arg5_ = arg5; - } - - bool callback_received_; - A1 arg1_initial_, arg1_; - A2 arg2_initial_, arg2_; - A3 arg3_initial_, arg3_; - A4 arg4_initial_, arg4_; - A5 arg5_initial_, arg5_; - - DISALLOW_COPY_AND_ASSIGN(GenericSlot5); -}; -} // namespace rtc - -#endif // WEBRTC_BASE_GENERICSLOT_H_ diff --git a/base/genericslot.h.pump b/base/genericslot.h.pump deleted file mode 100755 index 4d1533c5..00000000 --- a/base/genericslot.h.pump +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2014 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef WEBRTC_BASE_GENERICSLOT_H_ -#define WEBRTC_BASE_GENERICSLOT_H_ - -// To generate genericslot.h from genericslot.h.pump, execute: -// /home/build/google3/third_party/gtest/scripts/pump.py genericslot.h.pump - -// Generic-slots are pure slots that can be hooked up to signals. They're -// mainly intended to be used in tests where we want to check if a signal -// was invoked and what arguments were passed. NOTE: They do not do any -// lifetime management of the arguments received via callbacks. -// -// Example: -// /* Some signal */ -// sigslot::signal1<int> foo; -// -// /* We want to monitor foo in some test */ -// rtc::GenericSlot1<int> slot(&foo, 0); -// foo.emit(5); -// EXPECT_TRUE(slot.callback_received()); -// EXPECT_EQ(5, *(slot.arg1())); -// - -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" - -namespace rtc { - -$var n = 5 -$range i 1..n -$for i [[ -$range j 1..i - -template <$for j , [[class A$j]]> -class GenericSlot$i : public sigslot::has_slots<> { - public: - GenericSlot$i(sigslot::signal$i<$for j , [[A$j]]>* signal, - $for j , [[const A$j& arg$j[[]]_initial]]) - : $for j , [[arg$j[[]]_initial_(arg$j[[]]_initial)]] { - Reset(); - signal->connect(this, &GenericSlot$i::OnSignalCallback); - } - - void Reset() { - callback_received_ = false;$for j [[ - - arg$j[[]]_ = arg$j[[]]_initial_; ]] - - } - - bool callback_received() const { return callback_received_; }$for j [[ - - const A$j& arg$j() const { return arg$j[[]]_; }]] - - - private: - void OnSignalCallback($for j , [[A$j arg$j]]) { - callback_received_ = true;$for j [[ - - arg$j[[]]_ = arg$j;]] - - } - - bool callback_received_;$for j [[ - - A$j arg$j[[]]_initial_, arg$j[[]]_;]] - - - DISALLOW_COPY_AND_ASSIGN(GenericSlot$i); -}; - -]] -} // namespace rtc - -#endif // WEBRTC_BASE_GENERICSLOT_H_ diff --git a/base/genericslot_unittest.cc b/base/genericslot_unittest.cc deleted file mode 100755 index 33d7db8b..00000000 --- a/base/genericslot_unittest.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2014 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -#include "webrtc/base/genericslot.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" - -namespace rtc { - -TEST(GenericSlotTest, TestSlot1) { - sigslot::signal1<int> source1; - GenericSlot1<int> slot1(&source1, 1); - EXPECT_FALSE(slot1.callback_received()); - source1.emit(10); - EXPECT_TRUE(slot1.callback_received()); - EXPECT_EQ(10, slot1.arg1()); -} - -TEST(GenericSlotTest, TestSlot2) { - sigslot::signal2<int, char> source2; - GenericSlot2<int, char> slot2(&source2, 1, '0'); - EXPECT_FALSE(slot2.callback_received()); - source2.emit(10, 'x'); - EXPECT_TRUE(slot2.callback_received()); - EXPECT_EQ(10, slot2.arg1()); - EXPECT_EQ('x', slot2.arg2()); -} - -// By induction we assume the rest work too... - -} // namespace rtc diff --git a/base/json.h b/base/json.h index fe41ac80..a8f76be1 100644 --- a/base/json.h +++ b/base/json.h @@ -14,7 +14,7 @@ #include <string> #include <vector> -#if !defined(WEBRTC_CHROMIUM_BUILD) +#if !defined(WEBRTC_EXTERNAL) #include "json/json.h" #else #include "third_party/jsoncpp/json.h" diff --git a/base/natserver_main.cc b/base/natserver_main.cc deleted file mode 100644 index 3ad2113a..00000000 --- a/base/natserver_main.cc +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2004 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include <iostream> - -#include "webrtc/base/natserver.h" -#include "webrtc/base/host.h" -#include "webrtc/base/physicalsocketserver.h" - -using namespace rtc; - -int main(int argc, char* argv[]) { - if (argc != 3) { - std::cerr << "usage: natserver <internal-ip> <external-ip>" << std::endl; - exit(1); - } - - SocketAddress internal = SocketAddress(argv[1]); - SocketAddress external = SocketAddress(argv[2]); - if (internal.EqualIPs(external)) { - std::cerr << "internal and external IPs must differ" << std::endl; - exit(1); - } - - Thread* pthMain = Thread::Current(); - PhysicalSocketServer* ss = new PhysicalSocketServer(); - pthMain->set_socketserver(ss); - NATServer* server = new NATServer(NAT_OPEN_CONE, ss, internal, ss, external); - server = server; - - pthMain->Run(); - return 0; -} diff --git a/base/opensslstreamadapter.cc b/base/opensslstreamadapter.cc index f057b8e5..5eaeb1b5 100644 --- a/base/opensslstreamadapter.cc +++ b/base/opensslstreamadapter.cc @@ -762,6 +762,18 @@ int OpenSSLStreamAdapter::SSLVerifyCallback(int ok, X509_STORE_CTX* store) { return 0; } X509* cert = X509_STORE_CTX_get_current_cert(store); + int depth = X509_STORE_CTX_get_error_depth(store); + + // For now We ignore the parent certificates and verify the leaf against + // the digest. + // + // TODO(jiayl): Verify the chain is a proper chain and report the chain to + // |stream->peer_certificate_|, like what NSS does. + if (depth > 0) { + LOG(LS_INFO) << "Ignored chained certificate at depth " << depth; + return 1; + } + unsigned char digest[EVP_MAX_MD_SIZE]; size_t digest_length; if (!OpenSSLCertificate::ComputeDigest( @@ -772,6 +784,7 @@ int OpenSSLStreamAdapter::SSLVerifyCallback(int ok, X509_STORE_CTX* store) { LOG(LS_WARNING) << "Failed to compute peer cert digest."; return 0; } + Buffer computed_digest(digest, digest_length); if (computed_digest != stream->peer_certificate_digest_value_) { LOG(LS_WARNING) << "Rejected peer certificate due to mismatched digest."; @@ -781,6 +794,7 @@ int OpenSSLStreamAdapter::SSLVerifyCallback(int ok, X509_STORE_CTX* store) { // value in checking the validity of a self-signed cert issued by untrusted // sources. LOG(LS_INFO) << "Accepted peer certificate."; + // Record the peer's certificate. stream->peer_certificate_.reset(new OpenSSLCertificate(cert)); return 1; diff --git a/base/sigslottester.h b/base/sigslottester.h new file mode 100755 index 00000000..ae781a97 --- /dev/null +++ b/base/sigslottester.h @@ -0,0 +1,199 @@ +// This file was GENERATED by command: +// pump.py sigslottester.h.pump +// DO NOT EDIT BY HAND!!! + +/* + * Copyright 2014 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_BASE_SIGSLOTTESTER_H_ +#define WEBRTC_BASE_SIGSLOTTESTER_H_ + +// To generate sigslottester.h from sigslottester.h.pump, execute: +// /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump + + +// SigslotTester(s) are utility classes to check if signals owned by an +// object are being invoked at the right time and with the right arguments. +// They are meant to be used in tests. Tests must provide "capture" pointers +// (i.e. address of variables) where the arguments from the signal callback +// can be stored. +// +// Example: +// /* Some signal */ +// sigslot::signal1<const std::string&> foo; +// +// /* We want to monitor foo in some test. Note how signal argument is +// const std::string&, but capture-type is std::string. Capture type +// must be type that can be assigned to. */ +// std::string capture; +// SigslotTester1<const std::string&, std::string> slot(&foo, &capture); +// foo.emit("hello"); +// EXPECT_EQ(1, slot.callback_count()); +// EXPECT_EQ("hello", capture); +// /* See unit-tests for more examples */ + +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/sigslot.h" + +namespace rtc { + +// For all the templates below: +// - A1-A5 is the type of the argument i in the callback. Signals may and often +// do use const-references here for efficiency. +// - C1-C5 is the type of the variable to capture argument i. These should be +// non-const value types suitable for use as lvalues. + +template <class A1, class C1> +class SigslotTester1 : public sigslot::has_slots<> { + public: + SigslotTester1(sigslot::signal1<A1>* signal, + C1* capture1) + : callback_count_(0), + capture1_(capture1) { + signal->connect(this, &SigslotTester1::OnSignalCallback); + } + + int callback_count() const { return callback_count_; } + + private: + void OnSignalCallback(A1 arg1) { + callback_count_++; + *capture1_ = arg1; + } + + int callback_count_; + C1* capture1_; + + DISALLOW_COPY_AND_ASSIGN(SigslotTester1); +}; + +template <class A1, class A2, class C1, class C2> +class SigslotTester2 : public sigslot::has_slots<> { + public: + SigslotTester2(sigslot::signal2<A1, A2>* signal, + C1* capture1, C2* capture2) + : callback_count_(0), + capture1_(capture1), capture2_(capture2) { + signal->connect(this, &SigslotTester2::OnSignalCallback); + } + + int callback_count() const { return callback_count_; } + + private: + void OnSignalCallback(A1 arg1, A2 arg2) { + callback_count_++; + *capture1_ = arg1; + *capture2_ = arg2; + } + + int callback_count_; + C1* capture1_; + C2* capture2_; + + DISALLOW_COPY_AND_ASSIGN(SigslotTester2); +}; + +template <class A1, class A2, class A3, class C1, class C2, class C3> +class SigslotTester3 : public sigslot::has_slots<> { + public: + SigslotTester3(sigslot::signal3<A1, A2, A3>* signal, + C1* capture1, C2* capture2, C3* capture3) + : callback_count_(0), + capture1_(capture1), capture2_(capture2), capture3_(capture3) { + signal->connect(this, &SigslotTester3::OnSignalCallback); + } + + int callback_count() const { return callback_count_; } + + private: + void OnSignalCallback(A1 arg1, A2 arg2, A3 arg3) { + callback_count_++; + *capture1_ = arg1; + *capture2_ = arg2; + *capture3_ = arg3; + } + + int callback_count_; + C1* capture1_; + C2* capture2_; + C3* capture3_; + + DISALLOW_COPY_AND_ASSIGN(SigslotTester3); +}; + +template <class A1, class A2, class A3, class A4, class C1, class C2, class C3, + class C4> +class SigslotTester4 : public sigslot::has_slots<> { + public: + SigslotTester4(sigslot::signal4<A1, A2, A3, A4>* signal, + C1* capture1, C2* capture2, C3* capture3, C4* capture4) + : callback_count_(0), + capture1_(capture1), capture2_(capture2), capture3_(capture3), + capture4_(capture4) { + signal->connect(this, &SigslotTester4::OnSignalCallback); + } + + int callback_count() const { return callback_count_; } + + private: + void OnSignalCallback(A1 arg1, A2 arg2, A3 arg3, A4 arg4) { + callback_count_++; + *capture1_ = arg1; + *capture2_ = arg2; + *capture3_ = arg3; + *capture4_ = arg4; + } + + int callback_count_; + C1* capture1_; + C2* capture2_; + C3* capture3_; + C4* capture4_; + + DISALLOW_COPY_AND_ASSIGN(SigslotTester4); +}; + +template <class A1, class A2, class A3, class A4, class A5, class C1, class C2, + class C3, class C4, class C5> +class SigslotTester5 : public sigslot::has_slots<> { + public: + SigslotTester5(sigslot::signal5<A1, A2, A3, A4, A5>* signal, + C1* capture1, C2* capture2, C3* capture3, C4* capture4, + C5* capture5) + : callback_count_(0), + capture1_(capture1), capture2_(capture2), capture3_(capture3), + capture4_(capture4), capture5_(capture5) { + signal->connect(this, &SigslotTester5::OnSignalCallback); + } + + int callback_count() const { return callback_count_; } + + private: + void OnSignalCallback(A1 arg1, A2 arg2, A3 arg3, A4 arg4, A5 arg5) { + callback_count_++; + *capture1_ = arg1; + *capture2_ = arg2; + *capture3_ = arg3; + *capture4_ = arg4; + *capture5_ = arg5; + } + + int callback_count_; + C1* capture1_; + C2* capture2_; + C3* capture3_; + C4* capture4_; + C5* capture5_; + + DISALLOW_COPY_AND_ASSIGN(SigslotTester5); +}; +} // namespace rtc + +#endif // WEBRTC_BASE_SIGSLOTTESTER_H_ diff --git a/base/sigslottester.h.pump b/base/sigslottester.h.pump new file mode 100755 index 00000000..2fd9386a --- /dev/null +++ b/base/sigslottester.h.pump @@ -0,0 +1,85 @@ +/* + * Copyright 2014 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_BASE_SIGSLOTTESTER_H_ +#define WEBRTC_BASE_SIGSLOTTESTER_H_ + +// To generate sigslottester.h from sigslottester.h.pump, execute: +// /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump + + +// SigslotTester(s) are utility classes to check if signals owned by an +// object are being invoked at the right time and with the right arguments. +// They are meant to be used in tests. Tests must provide "capture" pointers +// (i.e. address of variables) where the arguments from the signal callback +// can be stored. +// +// Example: +// /* Some signal */ +// sigslot::signal1<const std::string&> foo; +// +// /* We want to monitor foo in some test. Note how signal argument is +// const std::string&, but capture-type is std::string. Capture type +// must be type that can be assigned to. */ +// std::string capture; +// SigslotTester1<const std::string&, std::string> slot(&foo, &capture); +// foo.emit("hello"); +// EXPECT_EQ(1, slot.callback_count()); +// EXPECT_EQ("hello", capture); +// /* See unit-tests for more examples */ + +#include "webrtc/base/constructormagic.h" +#include "webrtc/base/sigslot.h" + +namespace rtc { + +// For all the templates below: +// - A1-A5 is the type of the argument i in the callback. Signals may and often +// do use const-references here for efficiency. +// - C1-C5 is the type of the variable to capture argument i. These should be +// non-const value types suitable for use as lvalues. + +$var n = 5 +$range i 1..n +$for i [[ +$range j 1..i + +template <$for j , [[class A$j]], $for j , [[class C$j]]> +class SigslotTester$i : public sigslot::has_slots<> { + public: + SigslotTester$i(sigslot::signal$i<$for j , [[A$j]]>* signal, + $for j , [[C$j* capture$j]]) + : callback_count_(0), + $for j , [[capture$j[[]]_(capture$j)]] { + signal->connect(this, &SigslotTester$i::OnSignalCallback); + } + + int callback_count() const { return callback_count_; } + + private: + void OnSignalCallback($for j , [[A$j arg$j]]) { + callback_count_++;$for j [[ + + *capture$j[[]]_ = arg$j;]] + + } + + int callback_count_;$for j [[ + + C$j* capture$j[[]]_;]] + + + DISALLOW_COPY_AND_ASSIGN(SigslotTester$i); +}; + +]] +} // namespace rtc + +#endif // WEBRTC_BASE_SIGSLOTTESTER_H_ diff --git a/base/sigslottester_unittest.cc b/base/sigslottester_unittest.cc new file mode 100755 index 00000000..778e352f --- /dev/null +++ b/base/sigslottester_unittest.cc @@ -0,0 +1,86 @@ +/* + * Copyright 2014 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/base/sigslottester.h" + +#include <string> + +#include "webrtc/base/gunit.h" +#include "webrtc/base/sigslot.h" + +namespace rtc { + +TEST(SigslotTester, TestSignal1Arg) { + sigslot::signal1<int> source1; + int capture1; + SigslotTester1<int, int> slot1(&source1, &capture1); + EXPECT_EQ(0, slot1.callback_count()); + + source1.emit(10); + EXPECT_EQ(1, slot1.callback_count()); + EXPECT_EQ(10, capture1); + + source1.emit(20); + EXPECT_EQ(2, slot1.callback_count()); + EXPECT_EQ(20, capture1); +} + +TEST(SigslotTester, TestSignal2Args) { + sigslot::signal2<int, char> source2; + int capture1; + char capture2; + SigslotTester2<int, char, int, char> slot2(&source2, &capture1, &capture2); + EXPECT_EQ(0, slot2.callback_count()); + + source2.emit(10, 'x'); + EXPECT_EQ(1, slot2.callback_count()); + EXPECT_EQ(10, capture1); + EXPECT_EQ('x', capture2); + + source2.emit(20, 'y'); + EXPECT_EQ(2, slot2.callback_count()); + EXPECT_EQ(20, capture1); + EXPECT_EQ('y', capture2); +} + +// Since it applies for 1 and 2 args, we assume it will work for up to 5 args. + +TEST(SigslotTester, TestSignalWithConstReferenceArgs) { + sigslot::signal1<const std::string&> source1; + std::string capture1; + SigslotTester1<const std::string&, std::string> slot1(&source1, &capture1); + EXPECT_EQ(0, slot1.callback_count()); + source1.emit("hello"); + EXPECT_EQ(1, slot1.callback_count()); + EXPECT_EQ("hello", capture1); +} + +TEST(SigslotTester, TestSignalWithPointerToConstArgs) { + sigslot::signal1<const std::string*> source1; + const std::string* capture1; + SigslotTester1<const std::string*, const std::string*> slot1(&source1, + &capture1); + EXPECT_EQ(0, slot1.callback_count()); + source1.emit(NULL); + EXPECT_EQ(1, slot1.callback_count()); + EXPECT_EQ(NULL, capture1); +} + +TEST(SigslotTester, TestSignalWithConstPointerArgs) { + sigslot::signal1<std::string* const> source1; + std::string* capture1; + SigslotTester1<std::string* const, std::string*> slot1(&source1, &capture1); + EXPECT_EQ(0, slot1.callback_count()); + source1.emit(NULL); + EXPECT_EQ(1, slot1.callback_count()); + EXPECT_EQ(NULL, capture1); +} + +} // namespace rtc diff --git a/base/thread_checker.h b/base/thread_checker.h new file mode 100644 index 00000000..eee93155 --- /dev/null +++ b/base/thread_checker.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +// Borrowed from Chromium's src/base/threading/thread_checker.h. + +#ifndef WEBRTC_BASE_THREAD_CHECKER_H_ +#define WEBRTC_BASE_THREAD_CHECKER_H_ + +// Apart from debug builds, we also enable the thread checker in +// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots +// with this define will get the same level of thread checking as +// debug bots. +// +// Note that this does not perfectly match situations where DCHECK is +// enabled. For example a non-official release build may have +// DCHECK_ALWAYS_ON undefined (and therefore ThreadChecker would be +// disabled) but have DCHECKs enabled at runtime. +#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) +#define ENABLE_THREAD_CHECKER 1 +#else +#define ENABLE_THREAD_CHECKER 0 +#endif + +#include "webrtc/base/thread_checker_impl.h" + +namespace rtc { + +// Do nothing implementation, for use in release mode. +// +// Note: You should almost always use the ThreadChecker class to get the +// right version for your build configuration. +class ThreadCheckerDoNothing { + public: + bool CalledOnValidThread() const { + return true; + } + + void DetachFromThread() {} +}; + +// ThreadChecker is a helper class used to help verify that some methods of a +// class are called from the same thread. It provides identical functionality to +// base::NonThreadSafe, but it is meant to be held as a member variable, rather +// than inherited from base::NonThreadSafe. +// +// While inheriting from base::NonThreadSafe may give a clear indication about +// the thread-safety of a class, it may also lead to violations of the style +// guide with regard to multiple inheritance. The choice between having a +// ThreadChecker member and inheriting from base::NonThreadSafe should be based +// on whether: +// - Derived classes need to know the thread they belong to, as opposed to +// having that functionality fully encapsulated in the base class. +// - Derived classes should be able to reassign the base class to another +// thread, via DetachFromThread. +// +// If neither of these are true, then having a ThreadChecker member and calling +// CalledOnValidThread is the preferable solution. +// +// Example: +// class MyClass { +// public: +// void Foo() { +// DCHECK(thread_checker_.CalledOnValidThread()); +// ... (do stuff) ... +// } +// +// private: +// ThreadChecker thread_checker_; +// } +// +// In Release mode, CalledOnValidThread will always return true. +#if ENABLE_THREAD_CHECKER +class ThreadChecker : public ThreadCheckerImpl { +}; +#else +class ThreadChecker : public ThreadCheckerDoNothing { +}; +#endif // ENABLE_THREAD_CHECKER + +#undef ENABLE_THREAD_CHECKER + +} // namespace rtc + +#endif // WEBRTC_BASE_THREAD_CHECKER_H_ diff --git a/base/thread_checker_impl.cc b/base/thread_checker_impl.cc new file mode 100644 index 00000000..4a7455d3 --- /dev/null +++ b/base/thread_checker_impl.cc @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +// Borrowed from Chromium's src/base/threading/thread_checker_impl.cc. + +#include "webrtc/base/thread_checker_impl.h" + +#include "webrtc/base/thread.h" + +namespace rtc { + +ThreadCheckerImpl::ThreadCheckerImpl() + : valid_thread_() { + EnsureThreadIdAssigned(); +} + +ThreadCheckerImpl::~ThreadCheckerImpl() { +} + +bool ThreadCheckerImpl::CalledOnValidThread() const { + CritScope scoped_lock(&lock_); + EnsureThreadIdAssigned(); + return valid_thread_->IsCurrent(); +} + +void ThreadCheckerImpl::DetachFromThread() { + CritScope scoped_lock(&lock_); + valid_thread_ = NULL; +} + +void ThreadCheckerImpl::EnsureThreadIdAssigned() const { + if (!valid_thread_) { + valid_thread_ = Thread::Current(); + } +} + +} // namespace rtc diff --git a/base/thread_checker_impl.h b/base/thread_checker_impl.h new file mode 100644 index 00000000..1d776b5e --- /dev/null +++ b/base/thread_checker_impl.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +// Borrowed from Chromium's src/base/threading/thread_checker_impl.h. + +#ifndef WEBRTC_BASE_THREAD_CHECKER_IMPL_H_ +#define WEBRTC_BASE_THREAD_CHECKER_IMPL_H_ + +#include "webrtc/base/criticalsection.h" + +namespace rtc { + +class Thread; + +// Real implementation of ThreadChecker, for use in debug mode, or +// for temporary use in release mode (e.g. to CHECK on a threading issue +// seen only in the wild). +// +// Note: You should almost always use the ThreadChecker class to get the +// right version for your build configuration. +class ThreadCheckerImpl { + public: + ThreadCheckerImpl(); + ~ThreadCheckerImpl(); + + bool CalledOnValidThread() const; + + // Changes the thread that is checked for in CalledOnValidThread. This may + // be useful when an object may be created on one thread and then used + // exclusively on another thread. + void DetachFromThread(); + + private: + void EnsureThreadIdAssigned() const; + + mutable CriticalSection lock_; + // This is mutable so that CalledOnValidThread can set it. + // It's guarded by |lock_|. + mutable const Thread* valid_thread_; +}; + +} // namespace rtc + +#endif // WEBRTC_BASE_THREAD_CHECKER_IMPL_H_ diff --git a/base/thread_checker_unittest.cc b/base/thread_checker_unittest.cc new file mode 100644 index 00000000..13c1da5e --- /dev/null +++ b/base/thread_checker_unittest.cc @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +// Borrowed from Chromium's src/base/threading/thread_checker_unittest.cc. + +#include <assert.h> + +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/thread.h" +#include "webrtc/base/thread_checker.h" +#include "webrtc/base/scoped_ptr.h" + +// Duplicated from base/threading/thread_checker.h so that we can be +// good citizens there and undef the macro. +#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) +#define ENABLE_THREAD_CHECKER 1 +#else +#define ENABLE_THREAD_CHECKER 0 +#endif + +namespace rtc { + +namespace { + +// Simple class to exercise the basics of ThreadChecker. +// Both the destructor and DoStuff should verify that they were +// called on the same thread as the constructor. +class ThreadCheckerClass : public ThreadChecker { + public: + ThreadCheckerClass() {} + + // Verifies that it was called on the same thread as the constructor. + void DoStuff() { + assert(CalledOnValidThread()); + } + + void DetachFromThread() { + ThreadChecker::DetachFromThread(); + } + + static void MethodOnDifferentThreadImpl(); + static void DetachThenCallFromDifferentThreadImpl(); + + private: + DISALLOW_COPY_AND_ASSIGN(ThreadCheckerClass); +}; + +// Calls ThreadCheckerClass::DoStuff on another thread. +class CallDoStuffOnThread : public Thread { + public: + explicit CallDoStuffOnThread(ThreadCheckerClass* thread_checker_class) + : Thread(), + thread_checker_class_(thread_checker_class) { + SetName("call_do_stuff_on_thread", NULL); + } + + virtual void Run() OVERRIDE { + thread_checker_class_->DoStuff(); + } + + // New method. Needed since Thread::Join is protected, and it is called by + // the TEST. + void Join() { + Thread::Join(); + } + + private: + ThreadCheckerClass* thread_checker_class_; + + DISALLOW_COPY_AND_ASSIGN(CallDoStuffOnThread); +}; + +// Deletes ThreadCheckerClass on a different thread. +class DeleteThreadCheckerClassOnThread : public Thread { + public: + explicit DeleteThreadCheckerClassOnThread( + ThreadCheckerClass* thread_checker_class) + : Thread(), + thread_checker_class_(thread_checker_class) { + SetName("delete_thread_checker_class_on_thread", NULL); + } + + virtual void Run() OVERRIDE { + thread_checker_class_.reset(); + } + + // New method. Needed since Thread::Join is protected, and it is called by + // the TEST. + void Join() { + Thread::Join(); + } + + private: + scoped_ptr<ThreadCheckerClass> thread_checker_class_; + + DISALLOW_COPY_AND_ASSIGN(DeleteThreadCheckerClassOnThread); +}; + +} // namespace + +TEST(ThreadCheckerTest, CallsAllowedOnSameThread) { + scoped_ptr<ThreadCheckerClass> thread_checker_class( + new ThreadCheckerClass); + + // Verify that DoStuff doesn't assert. + thread_checker_class->DoStuff(); + + // Verify that the destructor doesn't assert. + thread_checker_class.reset(); +} + +TEST(ThreadCheckerTest, DestructorAllowedOnDifferentThread) { + scoped_ptr<ThreadCheckerClass> thread_checker_class( + new ThreadCheckerClass); + + // Verify that the destructor doesn't assert + // when called on a different thread. + DeleteThreadCheckerClassOnThread delete_on_thread( + thread_checker_class.release()); + + delete_on_thread.Start(); + delete_on_thread.Join(); +} + +TEST(ThreadCheckerTest, DetachFromThread) { + scoped_ptr<ThreadCheckerClass> thread_checker_class( + new ThreadCheckerClass); + + // Verify that DoStuff doesn't assert when called on a different thread after + // a call to DetachFromThread. + thread_checker_class->DetachFromThread(); + CallDoStuffOnThread call_on_thread(thread_checker_class.get()); + + call_on_thread.Start(); + call_on_thread.Join(); +} + +#if GTEST_HAS_DEATH_TEST || !ENABLE_THREAD_CHECKER + +void ThreadCheckerClass::MethodOnDifferentThreadImpl() { + scoped_ptr<ThreadCheckerClass> thread_checker_class( + new ThreadCheckerClass); + + // DoStuff should assert in debug builds only when called on a + // different thread. + CallDoStuffOnThread call_on_thread(thread_checker_class.get()); + + call_on_thread.Start(); + call_on_thread.Join(); +} + +#if ENABLE_THREAD_CHECKER +TEST(ThreadCheckerDeathTest, MethodNotAllowedOnDifferentThreadInDebug) { + ASSERT_DEATH({ + ThreadCheckerClass::MethodOnDifferentThreadImpl(); + }, ""); +} +#else +TEST(ThreadCheckerTest, MethodAllowedOnDifferentThreadInRelease) { + ThreadCheckerClass::MethodOnDifferentThreadImpl(); +} +#endif // ENABLE_THREAD_CHECKER + +void ThreadCheckerClass::DetachThenCallFromDifferentThreadImpl() { + scoped_ptr<ThreadCheckerClass> thread_checker_class( + new ThreadCheckerClass); + + // DoStuff doesn't assert when called on a different thread + // after a call to DetachFromThread. + thread_checker_class->DetachFromThread(); + CallDoStuffOnThread call_on_thread(thread_checker_class.get()); + + call_on_thread.Start(); + call_on_thread.Join(); + + // DoStuff should assert in debug builds only after moving to + // another thread. + thread_checker_class->DoStuff(); +} + +#if ENABLE_THREAD_CHECKER +TEST(ThreadCheckerDeathTest, DetachFromThreadInDebug) { + ASSERT_DEATH({ + ThreadCheckerClass::DetachThenCallFromDifferentThreadImpl(); + }, ""); +} +#else +TEST(ThreadCheckerTest, DetachFromThreadInRelease) { + ThreadCheckerClass::DetachThenCallFromDifferentThreadImpl(); +} +#endif // ENABLE_THREAD_CHECKER + +#endif // GTEST_HAS_DEATH_TEST || !ENABLE_THREAD_CHECKER + +// Just in case we ever get lumped together with other compilation units. +#undef ENABLE_THREAD_CHECKER + +} // namespace rtc diff --git a/base/webrtc_base.target.darwin-arm.mk b/base/webrtc_base.target.darwin-arm.mk index 47f54b05..67e9aac6 100644 --- a/base/webrtc_base.target.darwin-arm.mk +++ b/base/webrtc_base.target.darwin-arm.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -150,6 +151,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -197,6 +199,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -321,6 +325,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.darwin-arm64.mk b/base/webrtc_base.target.darwin-arm64.mk index af485336..be752dda 100644 --- a/base/webrtc_base.target.darwin-arm64.mk +++ b/base/webrtc_base.target.darwin-arm64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -140,6 +141,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -184,6 +186,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -294,6 +298,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.darwin-mips.mk b/base/webrtc_base.target.darwin-mips.mk index 8c23419c..7af2891f 100644 --- a/base/webrtc_base.target.darwin-mips.mk +++ b/base/webrtc_base.target.darwin-mips.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -191,6 +193,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -262,6 +265,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -309,6 +313,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.darwin-x86.mk b/base/webrtc_base.target.darwin-x86.mk index d94a0db3..b2b01316 100644 --- a/base/webrtc_base.target.darwin-x86.mk +++ b/base/webrtc_base.target.darwin-x86.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -189,6 +191,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -259,6 +262,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -304,6 +308,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.darwin-x86_64.mk b/base/webrtc_base.target.darwin-x86_64.mk index 15ce3e16..a7a2c7d8 100644 --- a/base/webrtc_base.target.darwin-x86_64.mk +++ b/base/webrtc_base.target.darwin-x86_64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -188,6 +190,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -258,6 +261,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -303,6 +307,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.linux-arm.mk b/base/webrtc_base.target.linux-arm.mk index 47f54b05..67e9aac6 100644 --- a/base/webrtc_base.target.linux-arm.mk +++ b/base/webrtc_base.target.linux-arm.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -150,6 +151,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -197,6 +199,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -321,6 +325,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.linux-arm64.mk b/base/webrtc_base.target.linux-arm64.mk index af485336..be752dda 100644 --- a/base/webrtc_base.target.linux-arm64.mk +++ b/base/webrtc_base.target.linux-arm64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -140,6 +141,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -184,6 +186,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -294,6 +298,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.linux-mips.mk b/base/webrtc_base.target.linux-mips.mk index 8c23419c..7af2891f 100644 --- a/base/webrtc_base.target.linux-mips.mk +++ b/base/webrtc_base.target.linux-mips.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -191,6 +193,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -262,6 +265,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -309,6 +313,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.linux-x86.mk b/base/webrtc_base.target.linux-x86.mk index d94a0db3..b2b01316 100644 --- a/base/webrtc_base.target.linux-x86.mk +++ b/base/webrtc_base.target.linux-x86.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -189,6 +191,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -259,6 +262,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -304,6 +308,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/base/webrtc_base.target.linux-x86_64.mk b/base/webrtc_base.target.linux-x86_64.mk index 15ce3e16..a7a2c7d8 100644 --- a/base/webrtc_base.target.linux-x86_64.mk +++ b/base/webrtc_base.target.linux-x86_64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -188,6 +190,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -258,6 +261,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -303,6 +307,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/build/isolate.gypi b/build/isolate.gypi index 3387c367..ce90575e 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -94,6 +94,7 @@ # Path variables are used to replace file paths when loading a .isolate # file + '--path-variable', 'DEPTH', '<(DEPTH)', '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', '--config-variable', 'OS=<(OS)', @@ -61,7 +61,8 @@ class Call { : webrtc_config(NULL), send_transport(send_transport), voice_engine(NULL), - overuse_callback(NULL) {} + overuse_callback(NULL), + start_bitrate_bps(-1) {} webrtc::Config* webrtc_config; @@ -73,6 +74,11 @@ class Call { // Callback for overuse and normal usage based on the jitter of incoming // captured frames. 'NULL' disables the callback. OveruseCallback* overuse_callback; + + // Start bitrate used before a valid bitrate estimate is calculated. '-1' + // lets the call decide start bitrate. + // Note: This currently only affects video. + int start_bitrate_bps; }; static Call* Create(const Call::Config& config); @@ -83,7 +89,9 @@ class Call { virtual VideoSendStream::Config GetDefaultSendConfig() = 0; virtual VideoSendStream* CreateVideoSendStream( - const VideoSendStream::Config& config) = 0; + const VideoSendStream::Config& config, + const std::vector<VideoStream>& video_streams, + const void* encoder_settings) = 0; virtual void DestroyVideoSendStream(VideoSendStream* send_stream) = 0; diff --git a/common_audio/OWNERS b/common_audio/OWNERS index d6bbd0e2..83d774b2 100644 --- a/common_audio/OWNERS +++ b/common_audio/OWNERS @@ -3,6 +3,8 @@ tina.legrand@webrtc.org jan.skoglund@webrtc.org andrew@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/common_audio/common_audio.target.darwin-arm.mk b/common_audio/common_audio.target.darwin-arm.mk index 6c104782..b1fbcb0e 100644 --- a/common_audio/common_audio.target.darwin-arm.mk +++ b/common_audio/common_audio.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -165,6 +166,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -242,6 +244,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -282,6 +285,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.darwin-arm64.mk b/common_audio/common_audio.target.darwin-arm64.mk index 90ab4d78..9f28720d 100644 --- a/common_audio/common_audio.target.darwin-arm64.mk +++ b/common_audio/common_audio.target.darwin-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -152,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.darwin-mips.mk b/common_audio/common_audio.target.darwin-mips.mk index c06ef052..79968a37 100644 --- a/common_audio/common_audio.target.darwin-mips.mk +++ b/common_audio/common_audio.target.darwin-mips.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -163,6 +164,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -235,6 +237,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -274,6 +277,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk index fd537afe..64469323 100644 --- a/common_audio/common_audio.target.darwin-x86.mk +++ b/common_audio/common_audio.target.darwin-x86.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -157,6 +158,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -265,6 +268,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.darwin-x86_64.mk b/common_audio/common_audio.target.darwin-x86_64.mk index 96c6ab5f..9f7a06e8 100644 --- a/common_audio/common_audio.target.darwin-x86_64.mk +++ b/common_audio/common_audio.target.darwin-x86_64.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -156,6 +157,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -226,6 +228,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk index 6c104782..b1fbcb0e 100644 --- a/common_audio/common_audio.target.linux-arm.mk +++ b/common_audio/common_audio.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -165,6 +166,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -242,6 +244,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -282,6 +285,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.linux-arm64.mk b/common_audio/common_audio.target.linux-arm64.mk index 90ab4d78..9f28720d 100644 --- a/common_audio/common_audio.target.linux-arm64.mk +++ b/common_audio/common_audio.target.linux-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -152,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.linux-mips.mk b/common_audio/common_audio.target.linux-mips.mk index c06ef052..79968a37 100644 --- a/common_audio/common_audio.target.linux-mips.mk +++ b/common_audio/common_audio.target.linux-mips.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -163,6 +164,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -235,6 +237,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -274,6 +277,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.linux-x86.mk b/common_audio/common_audio.target.linux-x86.mk index fd537afe..64469323 100644 --- a/common_audio/common_audio.target.linux-x86.mk +++ b/common_audio/common_audio.target.linux-x86.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -157,6 +158,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -265,6 +268,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio.target.linux-x86_64.mk b/common_audio/common_audio.target.linux-x86_64.mk index 96c6ab5f..9f7a06e8 100644 --- a/common_audio/common_audio.target.linux-x86_64.mk +++ b/common_audio/common_audio.target.linux-x86_64.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -156,6 +157,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -226,6 +228,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_neon.target.darwin-arm.mk b/common_audio/common_audio_neon.target.darwin-arm.mk index 01d47849..11d7488b 100644 --- a/common_audio/common_audio_neon.target.darwin-arm.mk +++ b/common_audio/common_audio_neon.target.darwin-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -128,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_neon.target.linux-arm.mk b/common_audio/common_audio_neon.target.linux-arm.mk index 01d47849..11d7488b 100644 --- a/common_audio/common_audio_neon.target.linux-arm.mk +++ b/common_audio/common_audio_neon.target.linux-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -128,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_sse2.target.darwin-x86.mk b/common_audio/common_audio_sse2.target.darwin-x86.mk index 28ba5244..95860e57 100644 --- a/common_audio/common_audio_sse2.target.darwin-x86.mk +++ b/common_audio/common_audio_sse2.target.darwin-x86.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -221,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_sse2.target.darwin-x86_64.mk b/common_audio/common_audio_sse2.target.darwin-x86_64.mk index f83d4a92..b3269115 100644 --- a/common_audio/common_audio_sse2.target.darwin-x86_64.mk +++ b/common_audio/common_audio_sse2.target.darwin-x86_64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -182,6 +184,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -219,6 +222,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_sse2.target.linux-x86.mk b/common_audio/common_audio_sse2.target.linux-x86.mk index 28ba5244..95860e57 100644 --- a/common_audio/common_audio_sse2.target.linux-x86.mk +++ b/common_audio/common_audio_sse2.target.linux-x86.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -221,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_sse2.target.linux-x86_64.mk b/common_audio/common_audio_sse2.target.linux-x86_64.mk index f83d4a92..b3269115 100644 --- a/common_audio/common_audio_sse2.target.linux-x86_64.mk +++ b/common_audio/common_audio_sse2.target.linux-x86_64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -182,6 +184,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -219,6 +222,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_audio/common_audio_unittests.isolate b/common_audio/common_audio_unittests.isolate index 49f1e984..cc5e6ab4 100644 --- a/common_audio/common_audio_unittests.isolate +++ b/common_audio/common_audio_unittests.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h index ce84ec85..3a5d51cc 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -55,8 +55,6 @@ ((uint32_t) ((uint32_t)(a) * (uint32_t)(b))) #define WEBRTC_SPL_UMUL_16_16(a, b) \ ((uint32_t) (uint16_t)(a) * (uint16_t)(b)) -#define WEBRTC_SPL_UMUL_16_16_RSFT16(a, b) \ - (((uint32_t) (uint16_t)(a) * (uint16_t)(b)) >> 16) #define WEBRTC_SPL_UMUL_32_16(a, b) \ ((uint32_t) ((uint32_t)(a) * (uint16_t)(b))) #define WEBRTC_SPL_UMUL_32_16_RSFT16(a, b) \ @@ -125,8 +123,6 @@ #define WEBRTC_SPL_RSHIFT_W32(x, c) ((x) >> (c)) #define WEBRTC_SPL_LSHIFT_W32(x, c) ((x) << (c)) -#define WEBRTC_SPL_RSHIFT_U16(x, c) ((uint16_t)(x) >> (c)) -#define WEBRTC_SPL_LSHIFT_U16(x, c) ((uint16_t)(x) << (c)) #define WEBRTC_SPL_RSHIFT_U32(x, c) ((uint32_t)(x) >> (c)) #define WEBRTC_SPL_LSHIFT_U32(x, c) ((uint32_t)(x) << (c)) diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 90e116f3..81ca3694 100644 --- a/common_audio/signal_processing/signal_processing_unittest.cc +++ b/common_audio/signal_processing/signal_processing_unittest.cc @@ -47,7 +47,6 @@ TEST_F(SplTest, MacroTest) { EXPECT_EQ(2147483651u, WEBRTC_SPL_UMUL(a, b)); b = WEBRTC_SPL_WORD16_MAX >> 1; EXPECT_EQ(1073627139u, WEBRTC_SPL_UMUL_16_16(a, b)); - EXPECT_EQ(16382u, WEBRTC_SPL_UMUL_16_16_RSFT16(a, b)); EXPECT_EQ(4294918147u, WEBRTC_SPL_UMUL_32_16(a, b)); EXPECT_EQ(65535u, WEBRTC_SPL_UMUL_32_16_RSFT16(a, b)); EXPECT_EQ(-49149, WEBRTC_SPL_MUL_16_U16(a, b)); @@ -90,8 +89,6 @@ TEST_F(SplTest, MacroTest) { EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_W32(a, 1)); EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_W32(a, 1)); - EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_U16(a, 1)); - EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_U16(a, 1)); EXPECT_EQ(8191u, WEBRTC_SPL_RSHIFT_U32(a, 1)); EXPECT_EQ(32766u, WEBRTC_SPL_LSHIFT_U32(a, 1)); diff --git a/common_video/OWNERS b/common_video/OWNERS index 62c2ed1e..0c328fa9 100644 --- a/common_video/OWNERS +++ b/common_video/OWNERS @@ -3,6 +3,8 @@ mikhal@webrtc.org marpan@webrtc.org henrik.lundin@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/common_video/common_video.target.darwin-arm.mk b/common_video/common_video.target.darwin-arm.mk index d42a7a09..e4fcd4f6 100644 --- a/common_video/common_video.target.darwin-arm.mk +++ b/common_video/common_video.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -205,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -245,6 +248,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.darwin-arm64.mk b/common_video/common_video.target.darwin-arm64.mk index e2d0685e..67010e76 100644 --- a/common_video/common_video.target.darwin-arm64.mk +++ b/common_video/common_video.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.darwin-mips.mk b/common_video/common_video.target.darwin-mips.mk index 18e7044e..9687ab43 100644 --- a/common_video/common_video.target.darwin-mips.mk +++ b/common_video/common_video.target.darwin-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -233,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.darwin-x86.mk b/common_video/common_video.target.darwin-x86.mk index ff87e2a6..ecd62f0e 100644 --- a/common_video/common_video.target.darwin-x86.mk +++ b/common_video/common_video.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.darwin-x86_64.mk b/common_video/common_video.target.darwin-x86_64.mk index 0120d299..9f48d513 100644 --- a/common_video/common_video.target.darwin-x86_64.mk +++ b/common_video/common_video.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.linux-arm.mk b/common_video/common_video.target.linux-arm.mk index d42a7a09..e4fcd4f6 100644 --- a/common_video/common_video.target.linux-arm.mk +++ b/common_video/common_video.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -205,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -245,6 +248,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.linux-arm64.mk b/common_video/common_video.target.linux-arm64.mk index e2d0685e..67010e76 100644 --- a/common_video/common_video.target.linux-arm64.mk +++ b/common_video/common_video.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.linux-mips.mk b/common_video/common_video.target.linux-mips.mk index 18e7044e..9687ab43 100644 --- a/common_video/common_video.target.linux-mips.mk +++ b/common_video/common_video.target.linux-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -233,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.linux-x86.mk b/common_video/common_video.target.linux-x86.mk index ff87e2a6..ecd62f0e 100644 --- a/common_video/common_video.target.linux-x86.mk +++ b/common_video/common_video.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video.target.linux-x86_64.mk b/common_video/common_video.target.linux-x86_64.mk index 0120d299..9f48d513 100644 --- a/common_video/common_video.target.linux-x86_64.mk +++ b/common_video/common_video.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/common_video/common_video_unittests.isolate b/common_video/common_video_unittests.isolate index a95bd414..d33366c2 100644 --- a/common_video/common_video_unittests.isolate +++ b/common_video/common_video_unittests.isolate @@ -8,29 +8,27 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../DEPS', - '../../resources/foreman_cif.yuv', - '../../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/resources/foreman_cif.yuv', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/examples/android/media_demo/jni/on_load.cc b/examples/android/media_demo/jni/on_load.cc index 9f9a0c7a..9fc4ca92 100644 --- a/examples/android/media_demo/jni/on_load.cc +++ b/examples/android/media_demo/jni/on_load.cc @@ -38,7 +38,7 @@ JOWW(void, NativeWebRtcContextRegistry_register)( jobject context) { webrtc_examples::SetVoeDeviceObjects(g_vm); webrtc_examples::SetVieDeviceObjects(g_vm); - CHECK(webrtc::VideoEngine::SetAndroidObjects(g_vm) == 0, + CHECK(webrtc::VideoEngine::SetAndroidObjects(g_vm, context) == 0, "Failed to register android objects to video engine"); CHECK(webrtc::VoiceEngine::SetAndroidObjects(g_vm, jni, context) == 0, "Failed to register android objects to voice engine"); @@ -47,7 +47,7 @@ JOWW(void, NativeWebRtcContextRegistry_register)( JOWW(void, NativeWebRtcContextRegistry_unRegister)( JNIEnv* jni, jclass) { - CHECK(webrtc::VideoEngine::SetAndroidObjects(NULL) == 0, + CHECK(webrtc::VideoEngine::SetAndroidObjects(NULL, NULL) == 0, "Failed to unregister android objects from video engine"); CHECK(webrtc::VoiceEngine::SetAndroidObjects(NULL, NULL, NULL) == 0, "Failed to unregister android objects from voice engine"); diff --git a/modules/CNG.target.darwin-arm.mk b/modules/CNG.target.darwin-arm.mk index cc4cdc63..48b83dd8 100644 --- a/modules/CNG.target.darwin-arm.mk +++ b/modules/CNG.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -208,6 +210,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.darwin-arm64.mk b/modules/CNG.target.darwin-arm64.mk index 44e709f6..57253108 100644 --- a/modules/CNG.target.darwin-arm64.mk +++ b/modules/CNG.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -221,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.darwin-mips.mk b/modules/CNG.target.darwin-mips.mk index 9684599d..ec0dcc73 100644 --- a/modules/CNG.target.darwin-mips.mk +++ b/modules/CNG.target.darwin-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -199,6 +201,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -238,6 +241,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.darwin-x86.mk b/modules/CNG.target.darwin-x86.mk index febdbb77..b74118c8 100644 --- a/modules/CNG.target.darwin-x86.mk +++ b/modules/CNG.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.darwin-x86_64.mk b/modules/CNG.target.darwin-x86_64.mk index 754ef88f..04c79498 100644 --- a/modules/CNG.target.darwin-x86_64.mk +++ b/modules/CNG.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.linux-arm.mk b/modules/CNG.target.linux-arm.mk index cc4cdc63..48b83dd8 100644 --- a/modules/CNG.target.linux-arm.mk +++ b/modules/CNG.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -208,6 +210,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.linux-arm64.mk b/modules/CNG.target.linux-arm64.mk index 44e709f6..57253108 100644 --- a/modules/CNG.target.linux-arm64.mk +++ b/modules/CNG.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -221,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.linux-mips.mk b/modules/CNG.target.linux-mips.mk index 9684599d..ec0dcc73 100644 --- a/modules/CNG.target.linux-mips.mk +++ b/modules/CNG.target.linux-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -199,6 +201,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -238,6 +241,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.linux-x86.mk b/modules/CNG.target.linux-x86.mk index febdbb77..b74118c8 100644 --- a/modules/CNG.target.linux-x86.mk +++ b/modules/CNG.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/CNG.target.linux-x86_64.mk b/modules/CNG.target.linux-x86_64.mk index 754ef88f..04c79498 100644 --- a/modules/CNG.target.linux-x86_64.mk +++ b/modules/CNG.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.darwin-arm.mk b/modules/G711.target.darwin-arm.mk index 8bd6569c..e2be0f2d 100644 --- a/modules/G711.target.darwin-arm.mk +++ b/modules/G711.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -205,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -245,6 +248,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.darwin-arm64.mk b/modules/G711.target.darwin-arm64.mk index 55d15d00..d3eff919 100644 --- a/modules/G711.target.darwin-arm64.mk +++ b/modules/G711.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.darwin-mips.mk b/modules/G711.target.darwin-mips.mk index 65eecff3..6f636cee 100644 --- a/modules/G711.target.darwin-mips.mk +++ b/modules/G711.target.darwin-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.darwin-x86.mk b/modules/G711.target.darwin-x86.mk index f7da32d4..2a5336b0 100644 --- a/modules/G711.target.darwin-x86.mk +++ b/modules/G711.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.darwin-x86_64.mk b/modules/G711.target.darwin-x86_64.mk index 9e66980a..098100c3 100644 --- a/modules/G711.target.darwin-x86_64.mk +++ b/modules/G711.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.linux-arm.mk b/modules/G711.target.linux-arm.mk index 8bd6569c..e2be0f2d 100644 --- a/modules/G711.target.linux-arm.mk +++ b/modules/G711.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -205,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -245,6 +248,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.linux-arm64.mk b/modules/G711.target.linux-arm64.mk index 55d15d00..d3eff919 100644 --- a/modules/G711.target.linux-arm64.mk +++ b/modules/G711.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.linux-mips.mk b/modules/G711.target.linux-mips.mk index 65eecff3..6f636cee 100644 --- a/modules/G711.target.linux-mips.mk +++ b/modules/G711.target.linux-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.linux-x86.mk b/modules/G711.target.linux-x86.mk index f7da32d4..2a5336b0 100644 --- a/modules/G711.target.linux-x86.mk +++ b/modules/G711.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G711.target.linux-x86_64.mk b/modules/G711.target.linux-x86_64.mk index 9e66980a..098100c3 100644 --- a/modules/G711.target.linux-x86_64.mk +++ b/modules/G711.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.darwin-arm.mk b/modules/G722.target.darwin-arm.mk index ddb0a412..cc9fe2fd 100644 --- a/modules/G722.target.darwin-arm.mk +++ b/modules/G722.target.darwin-arm.mk @@ -87,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -206,6 +208,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -246,6 +249,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.darwin-arm64.mk b/modules/G722.target.darwin-arm64.mk index ae581e8e..fbaf1103 100644 --- a/modules/G722.target.darwin-arm64.mk +++ b/modules/G722.target.darwin-arm64.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -182,6 +184,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -219,6 +222,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.darwin-mips.mk b/modules/G722.target.darwin-mips.mk index f3b49391..9fb6a508 100644 --- a/modules/G722.target.darwin-mips.mk +++ b/modules/G722.target.darwin-mips.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -197,6 +199,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -236,6 +239,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.darwin-x86.mk b/modules/G722.target.darwin-x86.mk index 3f4c3778..242f640e 100644 --- a/modules/G722.target.darwin-x86.mk +++ b/modules/G722.target.darwin-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.darwin-x86_64.mk b/modules/G722.target.darwin-x86_64.mk index d7f3f907..8f71ab52 100644 --- a/modules/G722.target.darwin-x86_64.mk +++ b/modules/G722.target.darwin-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.linux-arm.mk b/modules/G722.target.linux-arm.mk index ddb0a412..cc9fe2fd 100644 --- a/modules/G722.target.linux-arm.mk +++ b/modules/G722.target.linux-arm.mk @@ -87,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -206,6 +208,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -246,6 +249,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.linux-arm64.mk b/modules/G722.target.linux-arm64.mk index ae581e8e..fbaf1103 100644 --- a/modules/G722.target.linux-arm64.mk +++ b/modules/G722.target.linux-arm64.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -182,6 +184,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -219,6 +222,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.linux-mips.mk b/modules/G722.target.linux-mips.mk index f3b49391..9fb6a508 100644 --- a/modules/G722.target.linux-mips.mk +++ b/modules/G722.target.linux-mips.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -197,6 +199,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -236,6 +239,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.linux-x86.mk b/modules/G722.target.linux-x86.mk index 3f4c3778..242f640e 100644 --- a/modules/G722.target.linux-x86.mk +++ b/modules/G722.target.linux-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/G722.target.linux-x86_64.mk b/modules/G722.target.linux-x86_64.mk index d7f3f907..8f71ab52 100644 --- a/modules/G722.target.linux-x86_64.mk +++ b/modules/G722.target.linux-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/OWNERS b/modules/OWNERS index 3ee6b4bf..bbffda7e 100644 --- a/modules/OWNERS +++ b/modules/OWNERS @@ -1,3 +1,4 @@ +per-file *.isolate=kjellander@webrtc.org # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/modules/PCM16B.target.darwin-arm.mk b/modules/PCM16B.target.darwin-arm.mk index 2a2a35ac..49eb9501 100644 --- a/modules/PCM16B.target.darwin-arm.mk +++ b/modules/PCM16B.target.darwin-arm.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -124,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.darwin-arm64.mk b/modules/PCM16B.target.darwin-arm64.mk index 20c8c878..afa31ccd 100644 --- a/modules/PCM16B.target.darwin-arm64.mk +++ b/modules/PCM16B.target.darwin-arm64.mk @@ -75,6 +75,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -111,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.darwin-mips.mk b/modules/PCM16B.target.darwin-mips.mk index 1c7909e5..8a0054c5 100644 --- a/modules/PCM16B.target.darwin-mips.mk +++ b/modules/PCM16B.target.darwin-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.darwin-x86.mk b/modules/PCM16B.target.darwin-x86.mk index a3d33b22..1288e024 100644 --- a/modules/PCM16B.target.darwin-x86.mk +++ b/modules/PCM16B.target.darwin-x86.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.darwin-x86_64.mk b/modules/PCM16B.target.darwin-x86_64.mk index 22d65267..db00bf34 100644 --- a/modules/PCM16B.target.darwin-x86_64.mk +++ b/modules/PCM16B.target.darwin-x86_64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.linux-arm.mk b/modules/PCM16B.target.linux-arm.mk index 2a2a35ac..49eb9501 100644 --- a/modules/PCM16B.target.linux-arm.mk +++ b/modules/PCM16B.target.linux-arm.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -124,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.linux-arm64.mk b/modules/PCM16B.target.linux-arm64.mk index 20c8c878..afa31ccd 100644 --- a/modules/PCM16B.target.linux-arm64.mk +++ b/modules/PCM16B.target.linux-arm64.mk @@ -75,6 +75,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -111,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.linux-mips.mk b/modules/PCM16B.target.linux-mips.mk index 1c7909e5..8a0054c5 100644 --- a/modules/PCM16B.target.linux-mips.mk +++ b/modules/PCM16B.target.linux-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.linux-x86.mk b/modules/PCM16B.target.linux-x86.mk index a3d33b22..1288e024 100644 --- a/modules/PCM16B.target.linux-x86.mk +++ b/modules/PCM16B.target.linux-x86.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/PCM16B.target.linux-x86_64.mk b/modules/PCM16B.target.linux-x86_64.mk index 22d65267..db00bf34 100644 --- a/modules/PCM16B.target.linux-x86_64.mk +++ b/modules/PCM16B.target.linux-x86_64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c b/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c index 62a20a2e..9391fb3c 100644 --- a/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c +++ b/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c @@ -17,7 +17,6 @@ #include "arith_routins.h" - /* Tables for piecewise linear cdf functions: y = k*x */ /* x Points for function piecewise() in Q15 */ @@ -304,7 +303,7 @@ int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7, cdfTmp = WebRtcIsacfix_Piecewise(WEBRTC_SPL_MUL_16_U16(candQ7, tmpARSpecQ8)); W_tmp = WEBRTC_SPL_UMUL_16_16(cdfTmp, W_upper_MSB); - W_tmp += WEBRTC_SPL_UMUL_16_16_RSFT16(cdfTmp, W_upper_LSB); + W_tmp += ((uint32_t)cdfTmp * (uint32_t)W_upper_LSB) >> 16; if (streamVal > W_tmp) { @@ -313,7 +312,7 @@ int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7, cdfTmp = WebRtcIsacfix_Piecewise(WEBRTC_SPL_MUL_16_U16(candQ7, tmpARSpecQ8)); W_tmp = WEBRTC_SPL_UMUL_16_16(cdfTmp, W_upper_MSB); - W_tmp += WEBRTC_SPL_UMUL_16_16_RSFT16(cdfTmp, W_upper_LSB); + W_tmp += ((uint32_t)cdfTmp * (uint32_t)W_upper_LSB) >> 16; while (streamVal > W_tmp) { @@ -323,7 +322,7 @@ int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7, WEBRTC_SPL_MUL_16_U16(candQ7, tmpARSpecQ8)); W_tmp = WEBRTC_SPL_UMUL_16_16(cdfTmp, W_upper_MSB); - W_tmp += WEBRTC_SPL_UMUL_16_16_RSFT16(cdfTmp, W_upper_LSB); + W_tmp += ((uint32_t)cdfTmp * (uint32_t)W_upper_LSB) >> 16; /* error check */ if (W_lower == W_tmp) { @@ -342,7 +341,7 @@ int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7, cdfTmp = WebRtcIsacfix_Piecewise(WEBRTC_SPL_MUL_16_U16(candQ7, tmpARSpecQ8)); W_tmp = WEBRTC_SPL_UMUL_16_16(cdfTmp, W_upper_MSB); - W_tmp += WEBRTC_SPL_UMUL_16_16_RSFT16(cdfTmp, W_upper_LSB); + W_tmp += ((uint32_t)cdfTmp * (uint32_t)W_upper_LSB) >> 16; while ( !(streamVal > W_tmp) ) { @@ -352,7 +351,7 @@ int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7, WEBRTC_SPL_MUL_16_U16(candQ7, tmpARSpecQ8)); W_tmp = WEBRTC_SPL_UMUL_16_16(cdfTmp, W_upper_MSB); - W_tmp += WEBRTC_SPL_UMUL_16_16_RSFT16(cdfTmp, W_upper_LSB); + W_tmp += ((uint32_t)cdfTmp * (uint32_t)W_upper_LSB) >> 16; /* error check */ if (W_upper == W_tmp){ @@ -384,7 +383,7 @@ int16_t WebRtcIsacfix_DecLogisticMulti2(int16_t *dataQ7, streamData->full = 1; } else { streamVal = WEBRTC_SPL_LSHIFT_W32(streamVal, 8) | - WEBRTC_SPL_RSHIFT_U16(*streamPtr, 8); + ((*streamPtr) >> 8); streamData->full = 0; } } else { diff --git a/modules/audio_coding/codecs/isac/fix/source/codec.h b/modules/audio_coding/codecs/isac/fix/source/codec.h index 88c7e1ab..2f649324 100644 --- a/modules/audio_coding/codecs/isac/fix/source/codec.h +++ b/modules/audio_coding/codecs/isac/fix/source/codec.h @@ -179,6 +179,21 @@ void WebRtcIsacfix_FilterMaLoopNeon(int16_t input0, int32_t* ptr2); #endif +#if defined(MIPS32_LE) +int WebRtcIsacfix_AutocorrMIPS(int32_t* __restrict r, + const int16_t* __restrict x, + int16_t N, + int16_t order, + int16_t* __restrict scale); + +void WebRtcIsacfix_FilterMaLoopMIPS(int16_t input0, + int16_t input1, + int32_t input2, + int32_t* ptr0, + int32_t* ptr1, + int32_t* ptr2); +#endif + /* Function pointers associated with the above functions. */ typedef int (*AutocorrFix)(int32_t* __restrict r, diff --git a/modules/audio_coding/codecs/isac/fix/source/encode.c b/modules/audio_coding/codecs/isac/fix/source/encode.c index e209c0ee..daf0d629 100644 --- a/modules/audio_coding/codecs/isac/fix/source/encode.c +++ b/modules/audio_coding/codecs/isac/fix/source/encode.c @@ -15,18 +15,21 @@ * */ -#include "arith_routins.h" -#include "bandwidth_estimator.h" -#include "codec.h" -#include "pitch_gain_tables.h" -#include "pitch_lag_tables.h" -#include "entropy_coding.h" -#include "lpc_tables.h" -#include "lpc_masking_model.h" -#include "pitch_estimator.h" -#include "structs.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" + +#include <assert.h> #include <stdio.h> +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routins.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" + int WebRtcIsacfix_EncodeImpl(int16_t *in, ISACFIX_EncInst_t *ISACenc_obj, @@ -450,12 +453,14 @@ int WebRtcIsacfix_EncodeImpl(int16_t *in, while (stream_length < MinBytes) { + assert(stream_length >= 0); if (stream_length & 0x0001){ ISACenc_obj->bitstr_seed = WEBRTC_SPL_RAND( ISACenc_obj->bitstr_seed ); ISACenc_obj->bitstr_obj.stream[ WEBRTC_SPL_RSHIFT_W16(stream_length, 1) ] |= (uint16_t)(ISACenc_obj->bitstr_seed & 0xFF); } else { ISACenc_obj->bitstr_seed = WEBRTC_SPL_RAND( ISACenc_obj->bitstr_seed ); - ISACenc_obj->bitstr_obj.stream[ WEBRTC_SPL_RSHIFT_W16(stream_length, 1) ] = WEBRTC_SPL_LSHIFT_U16(ISACenc_obj->bitstr_seed, 8); + ISACenc_obj->bitstr_obj.stream[stream_length / 2] = + ((uint16_t)ISACenc_obj->bitstr_seed << 8); } stream_length++; } @@ -467,7 +472,8 @@ int WebRtcIsacfix_EncodeImpl(int16_t *in, } else { ISACenc_obj->bitstr_obj.stream[usefulstr_len>>1] &= 0x00FF; - ISACenc_obj->bitstr_obj.stream[usefulstr_len>>1] += WEBRTC_SPL_LSHIFT_U16((MinBytes - usefulstr_len) & 0x00FF, 8); + ISACenc_obj->bitstr_obj.stream[usefulstr_len >> 1] += + ((uint16_t)((MinBytes - usefulstr_len) & 0x00FF) << 8); } } else diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h index 28d10357..3fefc1a5 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h +++ b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h @@ -58,6 +58,17 @@ void WebRtcIsacfix_AllpassFilter2FixDec16Neon( int32_t *filter_state_ch2); #endif +#if defined(MIPS_DSP_R1_LE) +void WebRtcIsacfix_AllpassFilter2FixDec16MIPS( + int16_t *data_ch1, + int16_t *data_ch2, + const int16_t *factor_ch1, + const int16_t *factor_ch2, + const int length, + int32_t *filter_state_ch1, + int32_t *filter_state_ch2); +#endif + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c new file mode 100644 index 00000000..1887745b --- /dev/null +++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" + +// WebRtcIsacfix_AllpassFilter2FixDec16 function optimized for MIPSDSP platform +// Bit-exact with WebRtcIsacfix_AllpassFilter2FixDec16C from filterbanks.c +void WebRtcIsacfix_AllpassFilter2FixDec16MIPS( + int16_t *data_ch1, // Input and output in channel 1, in Q0 + int16_t *data_ch2, // Input and output in channel 2, in Q0 + const int16_t *factor_ch1, // Scaling factor for channel 1, in Q15 + const int16_t *factor_ch2, // Scaling factor for channel 2, in Q15 + const int length, // Length of the data buffers + int32_t *filter_state_ch1, // Filter state for channel 1, in Q16 + int32_t *filter_state_ch2) { // Filter state for channel 2, in Q16 + + int32_t st0_ch1, st1_ch1; // channel1 state variables + int32_t st0_ch2, st1_ch2; // channel2 state variables + int32_t f_ch10, f_ch11, f_ch20, f_ch21; // factor variables + int32_t r0, r1, r2, r3, r4, r5; // temporary ragister variables + + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + // Load all the state and factor variables + "lh %[f_ch10], 0(%[factor_ch1]) \n\t" + "lh %[f_ch20], 0(%[factor_ch2]) \n\t" + "lh %[f_ch11], 2(%[factor_ch1]) \n\t" + "lh %[f_ch21], 2(%[factor_ch2]) \n\t" + "lw %[st0_ch1], 0(%[filter_state_ch1]) \n\t" + "lw %[st1_ch1], 4(%[filter_state_ch1]) \n\t" + "lw %[st0_ch2], 0(%[filter_state_ch2]) \n\t" + "lw %[st1_ch2], 4(%[filter_state_ch2]) \n\t" + // Allpass filtering loop + "1: \n\t" + "lh %[r0], 0(%[data_ch1]) \n\t" + "lh %[r1], 0(%[data_ch2]) \n\t" + "addiu %[length], %[length], -1 \n\t" + "mul %[r2], %[r0], %[f_ch10] \n\t" + "mul %[r3], %[r1], %[f_ch20] \n\t" + "sll %[r0], %[r0], 16 \n\t" + "sll %[r1], %[r1], 16 \n\t" + "sll %[r2], %[r2], 1 \n\t" + "addq_s.w %[r2], %[r2], %[st0_ch1] \n\t" + "sll %[r3], %[r3], 1 \n\t" + "addq_s.w %[r3], %[r3], %[st0_ch2] \n\t" + "sra %[r2], %[r2], 16 \n\t" + "mul %[st0_ch1], %[f_ch10], %[r2] \n\t" + "sra %[r3], %[r3], 16 \n\t" + "mul %[st0_ch2], %[f_ch20], %[r3] \n\t" + "mul %[r4], %[r2], %[f_ch11] \n\t" + "mul %[r5], %[r3], %[f_ch21] \n\t" + "sll %[st0_ch1], %[st0_ch1], 1 \n\t" + "subq_s.w %[st0_ch1], %[r0], %[st0_ch1] \n\t" + "sll %[st0_ch2], %[st0_ch2], 1 \n\t" + "subq_s.w %[st0_ch2], %[r1], %[st0_ch2] \n\t" + "sll %[r4], %[r4], 1 \n\t" + "addq_s.w %[r4], %[r4], %[st1_ch1] \n\t" + "sll %[r5], %[r5], 1 \n\t" + "addq_s.w %[r5], %[r5], %[st1_ch2] \n\t" + "sra %[r4], %[r4], 16 \n\t" + "mul %[r0], %[r4], %[f_ch11] \n\t" + "sra %[r5], %[r5], 16 \n\t" + "mul %[r1], %[r5], %[f_ch21] \n\t" + "sh %[r4], 0(%[data_ch1]) \n\t" + "sh %[r5], 0(%[data_ch2]) \n\t" + "addiu %[data_ch1], %[data_ch1], 2 \n\t" + "sll %[r2], %[r2], 16 \n\t" + "sll %[r0], %[r0], 1 \n\t" + "subq_s.w %[st1_ch1], %[r2], %[r0] \n\t" + "sll %[r3], %[r3], 16 \n\t" + "sll %[r1], %[r1], 1 \n\t" + "subq_s.w %[st1_ch2], %[r3], %[r1] \n\t" + "bgtz %[length], 1b \n\t" + " addiu %[data_ch2], %[data_ch2], 2 \n\t" + // Store channel states + "sw %[st0_ch1], 0(%[filter_state_ch1]) \n\t" + "sw %[st1_ch1], 4(%[filter_state_ch1]) \n\t" + "sw %[st0_ch2], 0(%[filter_state_ch2]) \n\t" + "sw %[st1_ch2], 4(%[filter_state_ch2]) \n\t" + ".set pop \n\t" + : [f_ch10] "=&r" (f_ch10), [f_ch20] "=&r" (f_ch20), + [f_ch11] "=&r" (f_ch11), [f_ch21] "=&r" (f_ch21), + [st0_ch1] "=&r" (st0_ch1), [st1_ch1] "=&r" (st1_ch1), + [st0_ch2] "=&r" (st0_ch2), [st1_ch2] "=&r" (st1_ch2), + [r0] "=&r" (r0), [r1] "=&r" (r1), [r2] "=&r" (r2), + [r3] "=&r" (r3), [r4] "=&r" (r4), [r5] "=&r" (r5) + : [factor_ch1] "r" (factor_ch1), [factor_ch2] "r" (factor_ch2), + [filter_state_ch1] "r" (filter_state_ch1), + [filter_state_ch2] "r" (filter_state_ch2), + [data_ch1] "r" (data_ch1), [data_ch2] "r" (data_ch2), + [length] "r" (length) + : "memory", "hi", "lo" + ); +} diff --git a/modules/audio_coding/codecs/isac/fix/source/filters_mips.c b/modules/audio_coding/codecs/isac/fix/source/filters_mips.c new file mode 100644 index 00000000..056dc275 --- /dev/null +++ b/modules/audio_coding/codecs/isac/fix/source/filters_mips.c @@ -0,0 +1,365 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" + +// MIPS optimized implementation of the Autocorrelation function in fixed point. +// NOTE! Different from SPLIB-version in how it scales the signal. +int WebRtcIsacfix_AutocorrMIPS(int32_t* __restrict r, + const int16_t* __restrict x, + int16_t N, + int16_t order, + int16_t* __restrict scale) { + int i = 0; + int16_t scaling = 0; + int16_t* in = (int16_t*)x; + int loop_size = (int)(N >> 3); + int count = (int)(N & 7); + // Declare temporary variables used as registry values. + int32_t r0, r1, r2, r3; +#if !defined(MIPS_DSP_R2_LE) + // For non-DSPR2 optimizations 4 more registers are used. + int32_t r4, r5, r6, r7; +#endif + + // Calculate r[0] and scaling needed. + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "mult $0, $0 \n\t" + // Loop is unrolled 8 times, set accumulator to zero in branch delay slot. + "beqz %[loop_size], 2f \n\t" + " mult $0, $0 \n\t" + "1: \n\t" + // Load 8 samples per loop iteration. +#if defined(MIPS_DSP_R2_LE) + "ulw %[r0], 0(%[in]) \n\t" + "ulw %[r1], 4(%[in]) \n\t" + "ulw %[r2], 8(%[in]) \n\t" + "ulw %[r3], 12(%[in]) \n\t" +#else + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 2(%[in]) \n\t" + "lh %[r2], 4(%[in]) \n\t" + "lh %[r3], 6(%[in]) \n\t" + "lh %[r4], 8(%[in]) \n\t" + "lh %[r5], 10(%[in]) \n\t" + "lh %[r6], 12(%[in]) \n\t" + "lh %[r7], 14(%[in]) \n\t" +#endif + "addiu %[loop_size], %[loop_size], -1 \n\t" + // Multiply and accumulate. +#if defined(MIPS_DSP_R2_LE) + "dpa.w.ph $ac0, %[r0], %[r0] \n\t" + "dpa.w.ph $ac0, %[r1], %[r1] \n\t" + "dpa.w.ph $ac0, %[r2], %[r2] \n\t" + "dpa.w.ph $ac0, %[r3], %[r3] \n\t" +#else + "madd %[r0], %[r0] \n\t" + "madd %[r1], %[r1] \n\t" + "madd %[r2], %[r2] \n\t" + "madd %[r3], %[r3] \n\t" + "madd %[r4], %[r4] \n\t" + "madd %[r5], %[r5] \n\t" + "madd %[r6], %[r6] \n\t" + "madd %[r7], %[r7] \n\t" +#endif + "bnez %[loop_size], 1b \n\t" + " addiu %[in], %[in], 16 \n\t" + "2: \n\t" + "beqz %[count], 4f \n\t" +#if defined(MIPS_DSP_R1_LE) + " extr.w %[r0], $ac0, 31 \n\t" +#else + " mfhi %[r2] \n\t" +#endif + // Process remaining samples (if any). + "3: \n\t" + "lh %[r0], 0(%[in]) \n\t" + "addiu %[count], %[count], -1 \n\t" + "madd %[r0], %[r0] \n\t" + "bnez %[count], 3b \n\t" + " addiu %[in], %[in], 2 \n\t" +#if defined(MIPS_DSP_R1_LE) + "extr.w %[r0], $ac0, 31 \n\t" +#else + "mfhi %[r2] \n\t" +#endif + "4: \n\t" +#if !defined(MIPS_DSP_R1_LE) + "mflo %[r3] \n\t" + "sll %[r0], %[r2], 1 \n\t" + "srl %[r1], %[r3], 31 \n\t" + "addu %[r0], %[r0], %[r1] \n\t" +#endif + // Calculate scaling (the value of shifting). + "clz %[r1], %[r0] \n\t" + "addiu %[r1], %[r1], -32 \n\t" + "subu %[scaling], $0, %[r1] \n\t" + "slti %[r1], %[r0], 0x1 \n\t" + "movn %[scaling], $0, %[r1] \n\t" +#if defined(MIPS_DSP_R1_LE) + "extrv.w %[r0], $ac0, %[scaling] \n\t" + "mfhi %[r2], $ac0 \n\t" +#else + "addiu %[r1], %[scaling], -32 \n\t" + "subu %[r1], $0, %[r1] \n\t" + "sllv %[r1], %[r2], %[r1] \n\t" + "srlv %[r0], %[r3], %[scaling] \n\t" + "addu %[r0], %[r0], %[r1] \n\t" +#endif + "slti %[r1], %[scaling], 32 \n\t" + "movz %[r0], %[r2], %[r1] \n\t" + ".set pop \n\t" + : [loop_size] "+r" (loop_size), [in] "+r" (in), [r0] "=&r" (r0), + [r1] "=&r" (r1), [r2] "=&r" (r2), [r3] "=&r" (r3), +#if !defined(MIPS_DSP_R2_LE) + [r4] "=&r" (r4), [r5] "=&r" (r5), [r6] "=&r" (r6), [r7] "=&r" (r7), +#endif + [count] "+r" (count), [scaling] "=r" (scaling) + : [N] "r" (N) + : "memory", "hi", "lo" + ); + r[0] = r0; + + // Correlation calculation is divided in 3 cases depending on the scaling + // value (different accumulator manipulation needed). Three slightly different + // loops are written in order to avoid branches inside the loop. + if (scaling == 0) { + // In this case, the result will be in low part of the accumulator. + for (i = 1; i < order + 1; i++) { + in = (int16_t*)x; + int16_t* in1 = (int16_t*)x + i; + count = N - i; + loop_size = (count) >> 2; + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "mult $0, $0 \n\t" + "beqz %[loop_size], 2f \n\t" + " andi %[count], %[count], 0x3 \n\t" + // Loop processing 4 pairs of samples per iteration. + "1: \n\t" +#if defined(MIPS_DSP_R2_LE) + "ulw %[r0], 0(%[in]) \n\t" + "ulw %[r1], 0(%[in1]) \n\t" + "ulw %[r2], 4(%[in]) \n\t" + "ulw %[r3], 4(%[in1]) \n\t" +#else + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 0(%[in1]) \n\t" + "lh %[r2], 2(%[in]) \n\t" + "lh %[r3], 2(%[in1]) \n\t" + "lh %[r4], 4(%[in]) \n\t" + "lh %[r5], 4(%[in1]) \n\t" + "lh %[r6], 6(%[in]) \n\t" + "lh %[r7], 6(%[in1]) \n\t" +#endif + "addiu %[loop_size], %[loop_size], -1 \n\t" +#if defined(MIPS_DSP_R2_LE) + "dpa.w.ph $ac0, %[r0], %[r1] \n\t" + "dpa.w.ph $ac0, %[r2], %[r3] \n\t" +#else + "madd %[r0], %[r1] \n\t" + "madd %[r2], %[r3] \n\t" + "madd %[r4], %[r5] \n\t" + "madd %[r6], %[r7] \n\t" +#endif + "addiu %[in], %[in], 8 \n\t" + "bnez %[loop_size], 1b \n\t" + " addiu %[in1], %[in1], 8 \n\t" + "2: \n\t" + "beqz %[count], 4f \n\t" + " mflo %[r0] \n\t" + // Process remaining samples (if any). + "3: \n\t" + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 0(%[in1]) \n\t" + "addiu %[count], %[count], -1 \n\t" + "addiu %[in], %[in], 2 \n\t" + "madd %[r0], %[r1] \n\t" + "bnez %[count], 3b \n\t" + " addiu %[in1], %[in1], 2 \n\t" + "mflo %[r0] \n\t" + "4: \n\t" + ".set pop \n\t" + : [loop_size] "+r" (loop_size), [in] "+r" (in), [in1] "+r" (in1), +#if !defined(MIPS_DSP_R2_LE) + [r4] "=&r" (r4), [r5] "=&r" (r5), [r6] "=&r" (r6), [r7] "=&r" (r7), +#endif + [r0] "=&r" (r0), [r1] "=&r" (r1), [r2] "=&r" (r2), [r3] "=&r" (r3), + [count] "+r" (count) + : + : "memory", "hi", "lo" + ); + r[i] = r0; + } + } else if (scaling == 32) { + // In this case, the result will be high part of the accumulator. + for (i = 1; i < order + 1; i++) { + in = (int16_t*)x; + int16_t* in1 = (int16_t*)x + i; + count = N - i; + loop_size = (count) >> 2; + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "mult $0, $0 \n\t" + "beqz %[loop_size], 2f \n\t" + " andi %[count], %[count], 0x3 \n\t" + // Loop processing 4 pairs of samples per iteration. + "1: \n\t" +#if defined(MIPS_DSP_R2_LE) + "ulw %[r0], 0(%[in]) \n\t" + "ulw %[r1], 0(%[in1]) \n\t" + "ulw %[r2], 4(%[in]) \n\t" + "ulw %[r3], 4(%[in1]) \n\t" +#else + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 0(%[in1]) \n\t" + "lh %[r2], 2(%[in]) \n\t" + "lh %[r3], 2(%[in1]) \n\t" + "lh %[r4], 4(%[in]) \n\t" + "lh %[r5], 4(%[in1]) \n\t" + "lh %[r6], 6(%[in]) \n\t" + "lh %[r7], 6(%[in1]) \n\t" +#endif + "addiu %[loop_size], %[loop_size], -1 \n\t" +#if defined(MIPS_DSP_R2_LE) + "dpa.w.ph $ac0, %[r0], %[r1] \n\t" + "dpa.w.ph $ac0, %[r2], %[r3] \n\t" +#else + "madd %[r0], %[r1] \n\t" + "madd %[r2], %[r3] \n\t" + "madd %[r4], %[r5] \n\t" + "madd %[r6], %[r7] \n\t" +#endif + "addiu %[in], %[in], 8 \n\t" + "bnez %[loop_size], 1b \n\t" + " addiu %[in1], %[in1], 8 \n\t" + "2: \n\t" + "beqz %[count], 4f \n\t" + " mfhi %[r0] \n\t" + // Process remaining samples (if any). + "3: \n\t" + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 0(%[in1]) \n\t" + "addiu %[count], %[count], -1 \n\t" + "addiu %[in], %[in], 2 \n\t" + "madd %[r0], %[r1] \n\t" + "bnez %[count], 3b \n\t" + " addiu %[in1], %[in1], 2 \n\t" + "mfhi %[r0] \n\t" + "4: \n\t" + ".set pop \n\t" + : [loop_size] "+r" (loop_size), [in] "+r" (in), [in1] "+r" (in1), +#if !defined(MIPS_DSP_R2_LE) + [r4] "=&r" (r4), [r5] "=&r" (r5), [r6] "=&r" (r6), [r7] "=&r" (r7), +#endif + [r0] "=&r" (r0), [r1] "=&r" (r1), [r2] "=&r" (r2), [r3] "=&r" (r3), + [count] "+r" (count) + : + : "memory", "hi", "lo" + ); + r[i] = r0; + } + } else { + // In this case, the result is obtained by combining low and high parts + // of the accumulator. +#if !defined(MIPS_DSP_R1_LE) + int32_t tmp_shift = 32 - scaling; +#endif + for (i = 1; i < order + 1; i++) { + in = (int16_t*)x; + int16_t* in1 = (int16_t*)x + i; + count = N - i; + loop_size = (count) >> 2; + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "mult $0, $0 \n\t" + "beqz %[loop_size], 2f \n\t" + " andi %[count], %[count], 0x3 \n\t" + "1: \n\t" +#if defined(MIPS_DSP_R2_LE) + "ulw %[r0], 0(%[in]) \n\t" + "ulw %[r1], 0(%[in1]) \n\t" + "ulw %[r2], 4(%[in]) \n\t" + "ulw %[r3], 4(%[in1]) \n\t" +#else + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 0(%[in1]) \n\t" + "lh %[r2], 2(%[in]) \n\t" + "lh %[r3], 2(%[in1]) \n\t" + "lh %[r4], 4(%[in]) \n\t" + "lh %[r5], 4(%[in1]) \n\t" + "lh %[r6], 6(%[in]) \n\t" + "lh %[r7], 6(%[in1]) \n\t" +#endif + "addiu %[loop_size], %[loop_size], -1 \n\t" +#if defined(MIPS_DSP_R2_LE) + "dpa.w.ph $ac0, %[r0], %[r1] \n\t" + "dpa.w.ph $ac0, %[r2], %[r3] \n\t" +#else + "madd %[r0], %[r1] \n\t" + "madd %[r2], %[r3] \n\t" + "madd %[r4], %[r5] \n\t" + "madd %[r6], %[r7] \n\t" +#endif + "addiu %[in], %[in], 8 \n\t" + "bnez %[loop_size], 1b \n\t" + " addiu %[in1], %[in1], 8 \n\t" + "2: \n\t" + "beqz %[count], 4f \n\t" +#if defined(MIPS_DSP_R1_LE) + " extrv.w %[r0], $ac0, %[scaling] \n\t" +#else + " mfhi %[r0] \n\t" +#endif + "3: \n\t" + "lh %[r0], 0(%[in]) \n\t" + "lh %[r1], 0(%[in1]) \n\t" + "addiu %[count], %[count], -1 \n\t" + "addiu %[in], %[in], 2 \n\t" + "madd %[r0], %[r1] \n\t" + "bnez %[count], 3b \n\t" + " addiu %[in1], %[in1], 2 \n\t" +#if defined(MIPS_DSP_R1_LE) + "extrv.w %[r0], $ac0, %[scaling] \n\t" +#else + "mfhi %[r0] \n\t" +#endif + "4: \n\t" +#if !defined(MIPS_DSP_R1_LE) + "mflo %[r1] \n\t" + "sllv %[r0], %[r0], %[tmp_shift] \n\t" + "srlv %[r1], %[r1], %[scaling] \n\t" + "addu %[r0], %[r0], %[r1] \n\t" +#endif + ".set pop \n\t" + : [loop_size] "+r" (loop_size), [in] "+r" (in), [in1] "+r" (in1), +#if !defined(MIPS_DSP_R2_LE) + [r4] "=&r" (r4), [r5] "=&r" (r5), [r6] "=&r" (r6), [r7] "=&r" (r7), +#endif + [r0] "=&r" (r0), [r1] "=&r" (r1), [r2] "=&r" (r2), [r3] "=&r" (r3), + [count] "+r" (count) + : [scaling] "r" (scaling) +#if !defined(MIPS_DSP_R1_LE) + , [tmp_shift] "r" (tmp_shift) +#endif + : "memory", "hi", "lo" + ); + r[i] = r0; + } + } + *scale = scaling; + + return (order + 1); +} diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/modules/audio_coding/codecs/isac/fix/source/isacfix.c index 30e6f67e..688ec07a 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isacfix.c +++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.c @@ -179,7 +179,7 @@ int16_t WebRtcIsacfix_FreeInternal(ISACFIX_MainStruct *ISAC_main_inst) } /**************************************************************************** - * WebRtcAecm_InitNeon(...) + * WebRtcIsacfix_InitNeon(...) * * This function initializes function pointers for ARM Neon platform. */ @@ -200,6 +200,23 @@ static void WebRtcIsacfix_InitNeon(void) { #endif /**************************************************************************** + * WebRtcIsacfix_InitMIPS(...) + * + * This function initializes function pointers for MIPS platform. + */ + +#if defined(MIPS32_LE) +static void WebRtcIsacfix_InitMIPS(void) { + WebRtcIsacfix_AutocorrFix = WebRtcIsacfix_AutocorrMIPS; + WebRtcIsacfix_FilterMaLoopFix = WebRtcIsacfix_FilterMaLoopMIPS; +#if defined(MIPS_DSP_R1_LE) + WebRtcIsacfix_AllpassFilter2FixDec16 = + WebRtcIsacfix_AllpassFilter2FixDec16MIPS; +#endif +} +#endif + +/**************************************************************************** * WebRtcIsacfix_EncoderInit(...) * * This function initializes a ISAC instance prior to the encoder calls. @@ -296,6 +313,10 @@ int16_t WebRtcIsacfix_EncoderInit(ISACFIX_MainStruct *ISAC_main_inst, WebRtcIsacfix_InitNeon(); #endif +#if defined(MIPS32_LE) + WebRtcIsacfix_InitMIPS(); +#endif + return statusInit; } diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi index 87c98606..a18a803d 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi +++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi @@ -85,6 +85,30 @@ 'pitch_filter_c.c', ], }], + ['target_arch=="mipsel"', { + 'sources': [ + 'filters_mips.c', + 'lattice_mips.c', + ], + 'sources!': [ + 'lattice_c.c', + ], + 'conditions': [ + ['mips_dsp_rev>0', { + 'sources': [ + 'filterbanks_mips.c', + ], + }], + ['mips_dsp_rev>1', { + 'sources': [ + 'pitch_filter_mips.c', + ], + 'sources!': [ + 'pitch_filter_c.c', + ], + }], + ], + }], ], }, ], diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c new file mode 100644 index 00000000..c5969221 --- /dev/null +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c @@ -0,0 +1,327 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "webrtc/typedefs.h" + +// Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients +// cth_Q15[] and sth_Q15[]. +void WebRtcIsacfix_FilterArLoop(int16_t* ar_g_Q0, // Input samples + int16_t* ar_f_Q0, // Input samples + int16_t* cth_Q15, // Filter coefficients + int16_t* sth_Q15, // Filter coefficients + int16_t order_coef) { // order of the filter + int n = 0; + + for (n = 0; n < HALF_SUBFRAMELEN - 1; n++) { + int count = order_coef - 1; + int offset; +#if !defined(MIPS_DSP_R1_LE) + int16_t* tmp_cth; + int16_t* tmp_sth; + int16_t* tmp_arg; + int32_t max_q16 = 0x7fff; + int32_t min_q16 = 0xffff8000; +#endif + // Declare variables used as temporary registers. + int32_t r0, r1, r2, t0, t1, t2, t_ar; + + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "bltz %[count], 2f \n\t" + " lh %[t_ar], 0(%[tmp]) \n\t" + // Inner loop + "1: \n\t" + "sll %[offset], %[count], 1 \n\t" +#if defined(MIPS_DSP_R1_LE) + "lhx %[r0], %[offset](%[cth_Q15]) \n\t" + "lhx %[r1], %[offset](%[sth_Q15]) \n\t" + "lhx %[r2], %[offset](%[ar_g_Q0]) \n\t" +#else + "addu %[tmp_cth], %[cth_Q15], %[offset] \n\t" + "addu %[tmp_sth], %[sth_Q15], %[offset] \n\t" + "addu %[tmp_arg], %[ar_g_Q0], %[offset] \n\t" + "lh %[r0], 0(%[tmp_cth]) \n\t" + "lh %[r1], 0(%[tmp_sth]) \n\t" + "lh %[r2], 0(%[tmp_arg]) \n\t" +#endif + "mul %[t0], %[r0], %[t_ar] \n\t" + "mul %[t1], %[r1], %[t_ar] \n\t" + "mul %[t2], %[r1], %[r2] \n\t" + "mul %[r0], %[r0], %[r2] \n\t" + "subu %[t0], %[t0], %[t2] \n\t" + "addu %[t1], %[t1], %[r0] \n\t" +#if defined(MIPS_DSP_R1_LE) + "shra_r.w %[t1], %[t1], 15 \n\t" + "shra_r.w %[t0], %[t0], 15 \n\t" +#else + "addiu %[t1], %[t1], 0x4000 \n\t" + "sra %[t1], %[t1], 15 \n\t" + "addiu %[t0], %[t0], 0x4000 \n\t" + "sra %[t0], %[t0], 15 \n\t" +#endif + "addiu %[offset], %[offset], 2 \n\t" +#if defined(MIPS_DSP_R1_LE) + "shll_s.w %[t1], %[t1], 16 \n\t" + "shll_s.w %[t_ar], %[t0], 16 \n\t" +#else + "slt %[r0], %[t1], %[max_q16] \n\t" + "slt %[r1], %[t0], %[max_q16] \n\t" + "movz %[t1], %[max_q16], %[r0] \n\t" + "movz %[t0], %[max_q16], %[r1] \n\t" +#endif + "addu %[offset], %[offset], %[ar_g_Q0] \n\t" +#if defined(MIPS_DSP_R1_LE) + "sra %[t1], %[t1], 16 \n\t" + "sra %[t_ar], %[t_ar], 16 \n\t" +#else + "slt %[r0], %[t1], %[min_q16] \n\t" + "slt %[r1], %[t0], %[min_q16] \n\t" + "movn %[t1], %[min_q16], %[r0] \n\t" + "movn %[t0], %[min_q16], %[r1] \n\t" + "addu %[t_ar], $zero, %[t0] \n\t" +#endif + "sh %[t1], 0(%[offset]) \n\t" + "bgtz %[count], 1b \n\t" + " addiu %[count], %[count], -1 \n\t" + "2: \n\t" + "sh %[t_ar], 0(%[tmp]) \n\t" + "sh %[t_ar], 0(%[ar_g_Q0]) \n\t" + ".set pop \n\t" + : [t_ar] "=&r" (t_ar), [count] "+r" (count), [offset] "=&r" (offset), + [r0] "=&r" (r0), [r1] "=&r" (r1), [r2] "=&r" (r2), [t0] "=&r" (t0), +#if !defined(MIPS_DSP_R1_LE) + [tmp_cth] "=&r" (tmp_cth), [tmp_sth] "=&r" (tmp_sth), + [tmp_arg] "=&r" (tmp_arg), +#endif + [t1] "=&r" (t1), [t2] "=&r" (t2) + : [tmp] "r" (&ar_f_Q0[n+1]), [cth_Q15] "r" (cth_Q15), +#if !defined(MIPS_DSP_R1_LE) + [max_q16] "r" (max_q16), [min_q16] "r" (min_q16), +#endif + [sth_Q15] "r" (sth_Q15), [ar_g_Q0] "r" (ar_g_Q0) + : "memory", "hi", "lo" + ); + } +} + +// MIPS optimization of the inner loop used for function +// WebRtcIsacfix_NormLatticeFilterMa(). It does: +// +// for 0 <= n < HALF_SUBFRAMELEN - 1: +// *ptr2 = input2 * (*ptr2) + input0 * (*ptr0)); +// *ptr1 = input1 * (*ptr0) + input0 * (*ptr2); +// +// Note, function WebRtcIsacfix_FilterMaLoopMIPS and WebRtcIsacfix_FilterMaLoopC +// are not bit-exact. The accuracy of the MIPS function is same or better. +void WebRtcIsacfix_FilterMaLoopMIPS(int16_t input0, // Filter coefficient + int16_t input1, // Filter coefficient + int32_t input2, // Inverse coeff (1/input1) + int32_t* ptr0, // Sample buffer + int32_t* ptr1, // Sample buffer + int32_t* ptr2) { // Sample buffer +#if defined(MIPS_DSP_R2_LE) + // MIPS DSPR2 version. 4 available accumulators allows loop unrolling 4 times. + // This variant is not bit-exact with WebRtcIsacfix_FilterMaLoopC, since we + // are exploiting 64-bit accumulators. The accuracy of the MIPS DSPR2 function + // is same or better. + int n = (HALF_SUBFRAMELEN - 1) >> 2; + int m = (HALF_SUBFRAMELEN - 1) & 3; + + int r0, r1, r2, r3; + int t0, t1, t2, t3; + int s0, s1, s2, s3; + + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "1: \n\t" + "lw %[r0], 0(%[ptr0]) \n\t" + "lw %[r1], 4(%[ptr0]) \n\t" + "lw %[r2], 8(%[ptr0]) \n\t" + "lw %[r3], 12(%[ptr0]) \n\t" + "mult $ac0, %[r0], %[input0] \n\t" + "mult $ac1, %[r1], %[input0] \n\t" + "mult $ac2, %[r2], %[input0] \n\t" + "mult $ac3, %[r3], %[input0] \n\t" + "lw %[t0], 0(%[ptr2]) \n\t" + "extr_rs.w %[s0], $ac0, 15 \n\t" + "extr_rs.w %[s1], $ac1, 15 \n\t" + "extr_rs.w %[s2], $ac2, 15 \n\t" + "extr_rs.w %[s3], $ac3, 15 \n\t" + "lw %[t1], 4(%[ptr2]) \n\t" + "lw %[t2], 8(%[ptr2]) \n\t" + "lw %[t3], 12(%[ptr2]) \n\t" + "addu %[t0], %[t0], %[s0] \n\t" + "addu %[t1], %[t1], %[s1] \n\t" + "addu %[t2], %[t2], %[s2] \n\t" + "addu %[t3], %[t3], %[s3] \n\t" + "mult $ac0, %[t0], %[input2] \n\t" + "mult $ac1, %[t1], %[input2] \n\t" + "mult $ac2, %[t2], %[input2] \n\t" + "mult $ac3, %[t3], %[input2] \n\t" + "addiu %[ptr0], %[ptr0], 16 \n\t" + "extr_rs.w %[t0], $ac0, 16 \n\t" + "extr_rs.w %[t1], $ac1, 16 \n\t" + "extr_rs.w %[t2], $ac2, 16 \n\t" + "extr_rs.w %[t3], $ac3, 16 \n\t" + "addiu %[n], %[n], -1 \n\t" + "mult $ac0, %[r0], %[input1] \n\t" + "mult $ac1, %[r1], %[input1] \n\t" + "mult $ac2, %[r2], %[input1] \n\t" + "mult $ac3, %[r3], %[input1] \n\t" + "sw %[t0], 0(%[ptr2]) \n\t" + "extr_rs.w %[s0], $ac0, 15 \n\t" + "extr_rs.w %[s1], $ac1, 15 \n\t" + "extr_rs.w %[s2], $ac2, 15 \n\t" + "extr_rs.w %[s3], $ac3, 15 \n\t" + "sw %[t1], 4(%[ptr2]) \n\t" + "sw %[t2], 8(%[ptr2]) \n\t" + "sw %[t3], 12(%[ptr2]) \n\t" + "mult $ac0, %[t0], %[input0] \n\t" + "mult $ac1, %[t1], %[input0] \n\t" + "mult $ac2, %[t2], %[input0] \n\t" + "mult $ac3, %[t3], %[input0] \n\t" + "addiu %[ptr2], %[ptr2], 16 \n\t" + "extr_rs.w %[t0], $ac0, 15 \n\t" + "extr_rs.w %[t1], $ac1, 15 \n\t" + "extr_rs.w %[t2], $ac2, 15 \n\t" + "extr_rs.w %[t3], $ac3, 15 \n\t" + "addu %[t0], %[t0], %[s0] \n\t" + "addu %[t1], %[t1], %[s1] \n\t" + "addu %[t2], %[t2], %[s2] \n\t" + "addu %[t3], %[t3], %[s3] \n\t" + "sw %[t0], 0(%[ptr1]) \n\t" + "sw %[t1], 4(%[ptr1]) \n\t" + "sw %[t2], 8(%[ptr1]) \n\t" + "sw %[t3], 12(%[ptr1]) \n\t" + "bgtz %[n], 1b \n\t" + " addiu %[ptr1], %[ptr1], 16 \n\t" + "beq %[m], %0, 3f \n\t" + " nop \n\t" + "2: \n\t" + "lw %[r0], 0(%[ptr0]) \n\t" + "lw %[t0], 0(%[ptr2]) \n\t" + "addiu %[ptr0], %[ptr0], 4 \n\t" + "mult $ac0, %[r0], %[input0] \n\t" + "mult $ac1, %[r0], %[input1] \n\t" + "extr_rs.w %[r1], $ac0, 15 \n\t" + "extr_rs.w %[t1], $ac1, 15 \n\t" + "addu %[t0], %[t0], %[r1] \n\t" + "mult $ac0, %[t0], %[input2] \n\t" + "extr_rs.w %[t0], $ac0, 16 \n\t" + "sw %[t0], 0(%[ptr2]) \n\t" + "mult $ac0, %[t0], %[input0] \n\t" + "addiu %[ptr2], %[ptr2], 4 \n\t" + "addiu %[m], %[m], -1 \n\t" + "extr_rs.w %[t0], $ac0, 15 \n\t" + "addu %[t0], %[t0], %[t1] \n\t" + "sw %[t0], 0(%[ptr1]) \n\t" + "bgtz %[m], 2b \n\t" + " addiu %[ptr1], %[ptr1], 4 \n\t" + "3: \n\t" + ".set pop \n\t" + : [r0] "=&r" (r0), [r1] "=&r" (r1), [r2] "=&r" (r2), + [r3] "=&r" (r3), [t0] "=&r" (t0), [t1] "=&r" (t1), + [t2] "=&r" (t2), [t3] "=&r" (t3), [s0] "=&r" (s0), + [s1] "=&r" (s1), [s2] "=&r" (s2), [s3] "=&r" (s3), + [ptr0] "+r" (ptr0), [ptr1] "+r" (ptr1), [m] "+r" (m), + [ptr2] "+r" (ptr2), [n] "+r" (n) + : [input0] "r" (input0), [input1] "r" (input1), + [input2] "r" (input2) + : "memory", "hi", "lo", "$ac1hi", "$ac1lo", "$ac2hi", + "$ac2lo", "$ac3hi", "$ac3lo" + ); +#else + // Non-DSPR2 version of the function. Avoiding the accumulator usage due to + // large latencies. This variant is bit-exact with C code. + int n = HALF_SUBFRAMELEN - 1; + int32_t t16a, t16b; + int32_t r0, r1, r2, r3, r4; + + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "sra %[t16a], %[input2], 16 \n\t" + "andi %[t16b], %[input2], 0xFFFF \n\t" +#if defined(MIPS32R2_LE) + "seh %[t16b], %[t16b] \n\t" + "seh %[input0], %[input0] \n\t" + "seh %[input1], %[input1] \n\t" +#else + "sll %[t16b], %[t16b], 16 \n\t" + "sra %[t16b], %[t16b], 16 \n\t" + "sll %[input0], %[input0], 16 \n\t" + "sra %[input0], %[input0], 16 \n\t" + "sll %[input1], %[input1], 16 \n\t" + "sra %[input1], %[input1], 16 \n\t" +#endif + "addiu %[r0], %[t16a], 1 \n\t" + "slt %[r1], %[t16b], $zero \n\t" + "movn %[t16a], %[r0], %[r1] \n\t" + "1: \n\t" + "lw %[r0], 0(%[ptr0]) \n\t" + "lw %[r1], 0(%[ptr2]) \n\t" + "addiu %[ptr0], %[ptr0], 4 \n\t" + "sra %[r2], %[r0], 16 \n\t" + "andi %[r0], %[r0], 0xFFFF \n\t" + "mul %[r3], %[r2], %[input0] \n\t" + "mul %[r4], %[r0], %[input0] \n\t" + "mul %[r2], %[r2], %[input1] \n\t" + "mul %[r0], %[r0], %[input1] \n\t" + "addiu %[ptr2], %[ptr2], 4 \n\t" + "sll %[r3], %[r3], 1 \n\t" + "sra %[r4], %[r4], 1 \n\t" + "addiu %[r4], %[r4], 0x2000 \n\t" + "sra %[r4], %[r4], 14 \n\t" + "addu %[r3], %[r3], %[r4] \n\t" + "addu %[r1], %[r1], %[r3] \n\t" + "sra %[r3], %[r1], 16 \n\t" + "andi %[r4], %[r1], 0xFFFF \n\t" + "sra %[r4], %[r4], 1 \n\t" + "mul %[r1], %[r1], %[t16a] \n\t" + "mul %[r3], %[r3], %[t16b] \n\t" + "mul %[r4], %[r4], %[t16b] \n\t" + "sll %[r2], %[r2], 1 \n\t" + "sra %[r0], %[r0], 1 \n\t" + "addiu %[r0], %[r0], 0x2000 \n\t" + "sra %[r0], %[r0], 14 \n\t" + "addu %[r0], %[r0], %[r2] \n\t" + "addiu %[n], %[n], -1 \n\t" + "addu %[r1], %[r1], %[r3] \n\t" + "addiu %[r4], %[r4], 0x4000 \n\t" + "sra %[r4], %[r4], 15 \n\t" + "addu %[r1], %[r1], %[r4] \n\t" + "sra %[r2], %[r1], 16 \n\t" + "andi %[r3], %[r1], 0xFFFF \n\t" + "mul %[r3], %[r3], %[input0] \n\t" + "mul %[r2], %[r2], %[input0] \n\t" + "sw %[r1], -4(%[ptr2]) \n\t" + "sra %[r3], %[r3], 1 \n\t" + "addiu %[r3], %[r3], 0x2000 \n\t" + "sra %[r3], %[r3], 14 \n\t" + "addu %[r0], %[r0], %[r3] \n\t" + "sll %[r2], %[r2], 1 \n\t" + "addu %[r0], %[r0], %[r2] \n\t" + "sw %[r0], 0(%[ptr1]) \n\t" + "bgtz %[n], 1b \n\t" + " addiu %[ptr1], %[ptr1], 4 \n\t" + ".set pop \n\t" + : [t16a] "=&r" (t16a), [t16b] "=&r" (t16b), [r0] "=&r" (r0), + [r1] "=&r" (r1), [r2] "=&r" (r2), [r3] "=&r" (r3), + [r4] "=&r" (r4), [ptr0] "+r" (ptr0), [ptr1] "+r" (ptr1), + [ptr2] "+r" (ptr2), [n] "+r" (n) + : [input0] "r" (input0), [input1] "r" (input1), + [input2] "r" (input2) + : "hi", "lo", "memory" + ); +#endif +} diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c new file mode 100644 index 00000000..8334f7eb --- /dev/null +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" + +void WebRtcIsacfix_PitchFilterCore(int loopNumber, + int16_t gain, + int index, + int16_t sign, + int16_t* inputState, + int16_t* outputBuf2, + const int16_t* coefficient, + int16_t* inputBuf, + int16_t* outputBuf, + int* index2) { + int ind2t = *index2; + int i = 0; + int16_t* out2_pos2 = &outputBuf2[PITCH_BUFFSIZE - (index + 2)] + ind2t; + int32_t w1, w2, w3, w4, w5, gain32, sign32; + int32_t coef1, coef2, coef3, coef4, coef5 = 0; + // Define damp factors as int32_t (pair of int16_t) + int32_t kDampF0 = 0x0000F70A; + int32_t kDampF1 = 0x51EC2000; + int32_t kDampF2 = 0xF70A2000; + int16_t* input1 = inputBuf + ind2t; + int16_t* output1 = outputBuf + ind2t; + int16_t* output2 = outputBuf2 + ind2t + PITCH_BUFFSIZE; + + // Load coefficients outside the loop and sign-extend gain and sign + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + "lwl %[coef1], 3(%[coefficient]) \n\t" + "lwl %[coef2], 7(%[coefficient]) \n\t" + "lwl %[coef3], 11(%[coefficient]) \n\t" + "lwl %[coef4], 15(%[coefficient]) \n\t" + "lwr %[coef1], 0(%[coefficient]) \n\t" + "lwr %[coef2], 4(%[coefficient]) \n\t" + "lwr %[coef3], 8(%[coefficient]) \n\t" + "lwr %[coef4], 12(%[coefficient]) \n\t" + "lhu %[coef5], 16(%[coefficient]) \n\t" + "seh %[gain32], %[gain] \n\t" + "seh %[sign32], %[sign] \n\t" + ".set pop \n\t" + : [coef1] "=&r" (coef1), [coef2] "=&r" (coef2), [coef3] "=&r" (coef3), + [coef4] "=&r" (coef4), [coef5] "=&r" (coef5), [gain32] "=&r" (gain32), + [sign32] "=&r" (sign32) + : [coefficient] "r" (coefficient), [gain] "r" (gain), + [sign] "r" (sign) + : "memory" + ); + + for (i = 0; i < loopNumber; i++) { + __asm __volatile ( + ".set push \n\t" + ".set noreorder \n\t" + // Filter to get fractional pitch + "li %[w1], 8192 \n\t" + "mtlo %[w1] \n\t" + "mthi $0 \n\t" + "lwl %[w1], 3(%[out2_pos2]) \n\t" + "lwl %[w2], 7(%[out2_pos2]) \n\t" + "lwl %[w3], 11(%[out2_pos2]) \n\t" + "lwl %[w4], 15(%[out2_pos2]) \n\t" + "lwr %[w1], 0(%[out2_pos2]) \n\t" + "lwr %[w2], 4(%[out2_pos2]) \n\t" + "lwr %[w3], 8(%[out2_pos2]) \n\t" + "lwr %[w4], 12(%[out2_pos2]) \n\t" + "lhu %[w5], 16(%[out2_pos2]) \n\t" + "dpa.w.ph $ac0, %[w1], %[coef1] \n\t" + "dpa.w.ph $ac0, %[w2], %[coef2] \n\t" + "dpa.w.ph $ac0, %[w3], %[coef3] \n\t" + "dpa.w.ph $ac0, %[w4], %[coef4] \n\t" + "dpa.w.ph $ac0, %[w5], %[coef5] \n\t" + "addiu %[out2_pos2], %[out2_pos2], 2 \n\t" + "mthi $0, $ac1 \n\t" + "lwl %[w2], 3(%[inputState]) \n\t" + "lwl %[w3], 7(%[inputState]) \n\t" + // Fractional pitch shift & saturation + "extr_s.h %[w1], $ac0, 14 \n\t" + "li %[w4], 16384 \n\t" + "lwr %[w2], 0(%[inputState]) \n\t" + "lwr %[w3], 4(%[inputState]) \n\t" + "mtlo %[w4], $ac1 \n\t" + // Shift low pass filter state + "swl %[w2], 5(%[inputState]) \n\t" + "swl %[w3], 9(%[inputState]) \n\t" + "mul %[w1], %[gain32], %[w1] \n\t" + "swr %[w2], 2(%[inputState]) \n\t" + "swr %[w3], 6(%[inputState]) \n\t" + // Low pass filter accumulation + "dpa.w.ph $ac1, %[kDampF1], %[w2] \n\t" + "dpa.w.ph $ac1, %[kDampF2], %[w3] \n\t" + "lh %[w4], 0(%[input1]) \n\t" + "addiu %[input1], %[input1], 2 \n\t" + "shra_r.w %[w1], %[w1], 12 \n\t" + "sh %[w1], 0(%[inputState]) \n\t" + "dpa.w.ph $ac1, %[kDampF0], %[w1] \n\t" + // Low pass filter shift & saturation + "extr_s.h %[w2], $ac1, 15 \n\t" + "mul %[w2], %[w2], %[sign32] \n\t" + // Buffer update + "subu %[w2], %[w4], %[w2] \n\t" + "shll_s.w %[w2], %[w2], 16 \n\t" + "sra %[w2], %[w2], 16 \n\t" + "sh %[w2], 0(%[output1]) \n\t" + "addu %[w2], %[w2], %[w4] \n\t" + "shll_s.w %[w2], %[w2], 16 \n\t" + "addiu %[output1], %[output1], 2 \n\t" + "sra %[w2], %[w2], 16 \n\t" + "sh %[w2], 0(%[output2]) \n\t" + "addiu %[output2], %[output2], 2 \n\t" + ".set pop \n\t" + : [w1] "=&r" (w1), [w2] "=&r" (w2), [w3] "=&r" (w3), [w4] "=&r" (w4), + [w5] "=&r" (w5), [input1] "+r" (input1), [out2_pos2] "+r" (out2_pos2), + [output1] "+r" (output1), [output2] "+r" (output2) + : [coefficient] "r" (coefficient), [inputState] "r" (inputState), + [gain32] "r" (gain32), [sign32] "r" (sign32), [kDampF0] "r" (kDampF0), + [kDampF1] "r" (kDampF1), [kDampF2] "r" (kDampF2), + [coef1] "r" (coef1), [coef2] "r" (coef2), [coef3] "r" (coef3), + [coef4] "r" (coef4), [coef5] "r" (coef5) + : "hi", "lo", "$ac1hi", "$ac1lo", "memory" + ); + } + (*index2) += loopNumber; +} diff --git a/modules/audio_coding/codecs/tools/OWNERS b/modules/audio_coding/codecs/tools/OWNERS index 3ee6b4bf..bbffda7e 100644 --- a/modules/audio_coding/codecs/tools/OWNERS +++ b/modules/audio_coding/codecs/tools/OWNERS @@ -1,3 +1,4 @@ +per-file *.isolate=kjellander@webrtc.org # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate b/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate index 82aaac05..8c5a2bd0 100644 --- a/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate +++ b/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate @@ -8,33 +8,31 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../../../../resources/', - '../../../../../../data/', + '<(DEPTH)/resources/', + '<(DEPTH)/data/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_touched': [ - '../../../../../DEPS', + '<(DEPTH)/DEPS', ], 'isolate_dependency_tracked': [ - '../../../../../resources/audio_coding/music_stereo_48kHz.pcm', - '../../../../../resources/audio_coding/speech_mono_16kHz.pcm', - '../../../../../resources/audio_coding/speech_mono_32_48kHz.pcm', - '../../../../../testing/test_env.py', + '<(DEPTH)/resources/audio_coding/music_stereo_48kHz.pcm', + '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', + '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/modules/audio_coding/main/acm2/acm_codec_database.cc b/modules/audio_coding/main/acm2/acm_codec_database.cc index fd30a137..e55b6c46 100644 --- a/modules/audio_coding/main/acm2/acm_codec_database.cc +++ b/modules/audio_coding/main/acm2/acm_codec_database.cc @@ -20,7 +20,7 @@ #include <assert.h> #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/trace.h" // Includes needed to create the codecs. diff --git a/modules/audio_coding/main/acm2/acm_codec_database.h b/modules/audio_coding/main/acm2/acm_codec_database.h index 98869efe..65be793e 100644 --- a/modules/audio_coding/main/acm2/acm_codec_database.h +++ b/modules/audio_coding/main/acm2/acm_codec_database.h @@ -18,7 +18,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" namespace webrtc { diff --git a/modules/audio_coding/main/acm2/acm_g722.h b/modules/audio_coding/main/acm2/acm_g722.h index 7216a574..6197a9d9 100644 --- a/modules/audio_coding/main/acm2/acm_g722.h +++ b/modules/audio_coding/main/acm2/acm_g722.h @@ -12,6 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_G722_H_ #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" typedef struct WebRtcG722EncInst G722EncInst; typedef struct WebRtcG722DecInst G722DecInst; @@ -40,7 +41,8 @@ class ACMG722 : public ACMGenericCodec { int32_t Add10MsDataSafe(const uint32_t timestamp, const int16_t* data, const uint16_t length_smpl, - const uint8_t audio_channel); + const uint8_t audio_channel) + EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); void DestructEncoderSafe(); diff --git a/modules/audio_coding/main/acm2/acm_generic_codec.cc b/modules/audio_coding/main/acm2/acm_generic_codec.cc index 5043717c..a4808c0e 100644 --- a/modules/audio_coding/main/acm2/acm_generic_codec.cc +++ b/modules/audio_coding/main/acm2/acm_generic_codec.cc @@ -26,7 +26,7 @@ namespace acm2 { // Enum for CNG enum { kMaxPLCParamsCNG = WEBRTC_CNG_MAX_LPC_ORDER, - kNewCNGNumPLCParams = 8 + kNewCNGNumLPCParams = 8 }; // Interval for sending new CNG parameters (SID frames) is 100 msec. @@ -56,7 +56,7 @@ ACMGenericCodec::ACMGenericCodec() vad_mode_(VADNormal), dtx_enabled_(false), ptr_dtx_inst_(NULL), - num_lpc_params_(kNewCNGNumPLCParams), + num_lpc_params_(kNewCNGNumLPCParams), sent_cn_previous_(false), prev_frame_cng_(0), has_internal_fec_(false), @@ -547,7 +547,7 @@ void ACMGenericCodec::DestructEncoder() { WebRtcCng_FreeEnc(ptr_dtx_inst_); ptr_dtx_inst_ = NULL; } - num_lpc_params_ = kNewCNGNumPLCParams; + num_lpc_params_ = kNewCNGNumLPCParams; DestructEncoderSafe(); } diff --git a/modules/audio_coding/main/acm2/acm_generic_codec.h b/modules/audio_coding/main/acm2/acm_generic_codec.h index 4f5dbc63..fa21ca01 100644 --- a/modules/audio_coding/main/acm2/acm_generic_codec.h +++ b/modules/audio_coding/main/acm2/acm_generic_codec.h @@ -13,9 +13,10 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/trace.h" #define MAX_FRAME_SIZE_10MSEC 6 @@ -616,7 +617,8 @@ class ACMGenericCodec { virtual int32_t Add10MsDataSafe(const uint32_t timestamp, const int16_t* data, const uint16_t length, - const uint8_t audio_channel); + const uint8_t audio_channel) + EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // See EncoderParam() for the description of function, input(s)/output(s) @@ -628,14 +630,15 @@ class ACMGenericCodec { // See ResetEncoder() for the description of function, input(s)/output(s) // and return value. // - int16_t ResetEncoderSafe(); + int16_t ResetEncoderSafe() EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // See InitEncoder() for the description of function, input(s)/output(s) // and return value. // int16_t InitEncoderSafe(WebRtcACMCodecParams* codec_params, - bool force_initialization); + bool force_initialization) + EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // See InitDecoder() for the description of function, input(s)/output(s) @@ -681,7 +684,8 @@ class ACMGenericCodec { // See SetVAD() for the description of function, input(s)/output(s) and // return value. // - int16_t SetVADSafe(bool* enable_dtx, bool* enable_vad, ACMVADMode* mode); + int16_t SetVADSafe(bool* enable_dtx, bool* enable_vad, ACMVADMode* mode) + EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // See ReplaceInternalDTX() for the description of function, input and @@ -718,7 +722,8 @@ class ACMGenericCodec { // -1 if failed, // 0 if succeeded. // - int16_t EnableVAD(ACMVADMode mode); + int16_t EnableVAD(ACMVADMode mode) + EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // int16_t DisableVAD() @@ -728,7 +733,7 @@ class ACMGenericCodec { // -1 if failed, // 0 if succeeded. // - int16_t DisableVAD(); + int16_t DisableVAD() EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // int16_t EnableDTX() @@ -739,7 +744,7 @@ class ACMGenericCodec { // -1 if failed, // 0 if succeeded. // - virtual int16_t EnableDTX(); + virtual int16_t EnableDTX() EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // int16_t DisableDTX() @@ -750,7 +755,7 @@ class ACMGenericCodec { // -1 if failed, // 0 if succeeded. // - virtual int16_t DisableDTX(); + virtual int16_t DisableDTX() EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // int16_t InternalEncode() @@ -878,7 +883,8 @@ class ACMGenericCodec { // int16_t ProcessFrameVADDTX(uint8_t* bitstream, int16_t* bitstream_len_byte, - int16_t* samples_processed); + int16_t* samples_processed) + EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_); /////////////////////////////////////////////////////////////////////////// // CurrentRate() @@ -925,19 +931,20 @@ class ACMGenericCodec { // True if the encoder instance initialized bool encoder_initialized_; - bool registered_in_neteq_; + const bool registered_in_neteq_; // TODO(henrik.lundin) Remove? // VAD/DTX bool has_internal_dtx_; - WebRtcVadInst* ptr_vad_inst_; - bool vad_enabled_; - ACMVADMode vad_mode_; - int16_t vad_label_[MAX_FRAME_SIZE_10MSEC]; - bool dtx_enabled_; - WebRtcCngEncInst* ptr_dtx_inst_; - uint8_t num_lpc_params_; - bool sent_cn_previous_; - int16_t prev_frame_cng_; + WebRtcVadInst* ptr_vad_inst_ GUARDED_BY(codec_wrapper_lock_); + bool vad_enabled_ GUARDED_BY(codec_wrapper_lock_); + ACMVADMode vad_mode_ GUARDED_BY(codec_wrapper_lock_); + int16_t vad_label_[MAX_FRAME_SIZE_10MSEC] GUARDED_BY(codec_wrapper_lock_); + bool dtx_enabled_ GUARDED_BY(codec_wrapper_lock_); + WebRtcCngEncInst* ptr_dtx_inst_ GUARDED_BY(codec_wrapper_lock_); + uint8_t num_lpc_params_ // TODO(henrik.lundin) Delete and + GUARDED_BY(codec_wrapper_lock_); // replace with kNewCNGNumLPCParams. + bool sent_cn_previous_ GUARDED_BY(codec_wrapper_lock_); + int16_t prev_frame_cng_ GUARDED_BY(codec_wrapper_lock_); // FEC. bool has_internal_fec_; @@ -952,7 +959,7 @@ class ACMGenericCodec { // such as buffers and state variables. RWLockWrapper& codec_wrapper_lock_; - uint32_t last_timestamp_; + uint32_t last_timestamp_ GUARDED_BY(codec_wrapper_lock_); uint32_t unique_id_; }; diff --git a/modules/audio_coding/main/acm2/acm_isac.cc b/modules/audio_coding/main/acm2/acm_isac.cc index e2728421..9fbcdd4c 100644 --- a/modules/audio_coding/main/acm2/acm_isac.cc +++ b/modules/audio_coding/main/acm2/acm_isac.cc @@ -14,7 +14,8 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" #ifdef WEBRTC_CODEC_ISAC @@ -59,14 +60,15 @@ static const int32_t kIsacRatesSwb[NR_ISAC_BANDWIDTHS] = { #if (!defined(WEBRTC_CODEC_ISAC) && !defined(WEBRTC_CODEC_ISACFX)) ACMISAC::ACMISAC(int16_t /* codec_id */) - : codec_inst_ptr_(NULL), + : codec_inst_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), + codec_inst_ptr_(NULL), is_enc_initialized_(false), isac_coding_mode_(CHANNEL_INDEPENDENT), enforce_frame_size_(false), isac_currentBN_(32000), samples_in10MsAudio_(160), // Initiates to 16 kHz mode. - audio_decoder_(NULL), - decoder_initialized_(false) {} + decoder_initialized_(false) { +} ACMISAC::~ACMISAC() { return; @@ -261,81 +263,14 @@ static uint16_t ACMISACFixGetDecSampRate(ACM_ISAC_STRUCT* /* inst */) { #endif -// Decoder class to be injected into NetEq. -class AcmAudioDecoderIsac : public AudioDecoder { - public: - AcmAudioDecoderIsac(int codec_id, void* state) - : AudioDecoder(ACMCodecDB::neteq_decoders_[codec_id]) { - state_ = state; - } - - // ACMISAC is the owner of the object where |state_| is pointing to. - // Therefore, it should not be deleted in this destructor. - virtual ~AcmAudioDecoderIsac() {} - - virtual int Decode(const uint8_t* encoded, size_t encoded_len, - int16_t* decoded, SpeechType* speech_type) { - int16_t temp_type; - int ret = ACM_ISAC_DECODE_B(static_cast<ACM_ISAC_STRUCT*>(state_), - reinterpret_cast<const uint16_t*>(encoded), - static_cast<int16_t>(encoded_len), decoded, - &temp_type); - *speech_type = ConvertSpeechType(temp_type); - return ret; - } - - virtual bool HasDecodePlc() const { return true; } - - virtual int DecodePlc(int num_frames, int16_t* decoded) { - return ACM_ISAC_DECODEPLC(static_cast<ACM_ISAC_STRUCT*>(state_), - decoded, static_cast<int16_t>(num_frames)); - } - - virtual int Init() { - return 0; // We expect that the initialized instance is injected in the - // constructor. - } - - virtual int IncomingPacket(const uint8_t* payload, - size_t payload_len, - uint16_t rtp_sequence_number, - uint32_t rtp_timestamp, - uint32_t arrival_timestamp) { - return ACM_ISAC_DECODE_BWE(static_cast<ACM_ISAC_STRUCT*>(state_), - reinterpret_cast<const uint16_t*>(payload), - static_cast<uint32_t>(payload_len), - rtp_sequence_number, - rtp_timestamp, - arrival_timestamp); - } - - virtual int DecodeRedundant(const uint8_t* encoded, - size_t encoded_len, int16_t* decoded, - SpeechType* speech_type) { - int16_t temp_type = 1; // Default is speech. - int16_t ret = ACM_ISAC_DECODERCU(static_cast<ACM_ISAC_STRUCT*>(state_), - reinterpret_cast<const uint16_t*>(encoded), - static_cast<int16_t>(encoded_len), decoded, - &temp_type); - *speech_type = ConvertSpeechType(temp_type); - return ret; - } - - virtual int ErrorCode() { - return ACM_ISAC_GETERRORCODE(static_cast<ACM_ISAC_STRUCT*>(state_)); - } - - private: - DISALLOW_COPY_AND_ASSIGN(AcmAudioDecoderIsac); -}; - ACMISAC::ACMISAC(int16_t codec_id) - : is_enc_initialized_(false), + : AudioDecoder(ACMCodecDB::neteq_decoders_[codec_id]), + codec_inst_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), + is_enc_initialized_(false), isac_coding_mode_(CHANNEL_INDEPENDENT), enforce_frame_size_(false), isac_current_bn_(32000), samples_in_10ms_audio_(160), // Initiates to 16 kHz mode. - audio_decoder_(NULL), decoder_initialized_(false) { codec_id_ = codec_id; @@ -345,14 +280,10 @@ ACMISAC::ACMISAC(int16_t codec_id) return; } codec_inst_ptr_->inst = NULL; + state_ = codec_inst_ptr_; } ACMISAC::~ACMISAC() { - if (audio_decoder_ != NULL) { - delete audio_decoder_; - audio_decoder_ = NULL; - } - if (codec_inst_ptr_ != NULL) { if (codec_inst_ptr_->inst != NULL) { ACM_ISAC_FREE(codec_inst_ptr_->inst); @@ -364,6 +295,34 @@ ACMISAC::~ACMISAC() { return; } +int16_t ACMISAC::InternalInitDecoder(WebRtcACMCodecParams* codec_params) { + // set decoder sampling frequency. + if (codec_params->codec_inst.plfreq == 32000 || + codec_params->codec_inst.plfreq == 48000) { + UpdateDecoderSampFreq(ACMCodecDB::kISACSWB); + } else { + UpdateDecoderSampFreq(ACMCodecDB::kISAC); + } + + // in a one-way communication we may never register send-codec. + // However we like that the BWE to work properly so it has to + // be initialized. The BWE is initialized when iSAC encoder is initialized. + // Therefore, we need this. + if (!encoder_initialized_) { + // Since we don't require a valid rate or a valid packet size when + // initializing the decoder, we set valid values before initializing encoder + codec_params->codec_inst.rate = kIsacWbDefaultRate; + codec_params->codec_inst.pacsize = kIsacPacSize960; + if (InternalInitEncoder(codec_params) < 0) { + return -1; + } + encoder_initialized_ = true; + } + + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + return ACM_ISAC_DECODERINIT(codec_inst_ptr_->inst); +} + ACMGenericCodec* ACMISAC::CreateInstance(void) { return NULL; } int16_t ACMISAC::InternalEncode(uint8_t* bitstream, @@ -375,6 +334,7 @@ int16_t ACMISAC::InternalEncode(uint8_t* bitstream, // at the first 10ms pushed in to iSAC if the bit-rate is low, this is // sort of a bug in iSAC. to address this we treat iSAC as the // following. + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (codec_inst_ptr_ == NULL) { return -1; } @@ -428,6 +388,7 @@ int16_t ACMISAC::InternalInitEncoder(WebRtcACMCodecParams* codec_params) { if (UpdateEncoderSampFreq((uint16_t)codec_params->codec_inst.plfreq) < 0) { return -1; } + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (ACM_ISAC_ENCODERINIT(codec_inst_ptr_->inst, isac_coding_mode_) < 0) { return -1; } @@ -450,38 +411,8 @@ int16_t ACMISAC::InternalInitEncoder(WebRtcACMCodecParams* codec_params) { return 0; } -int16_t ACMISAC::InternalInitDecoder(WebRtcACMCodecParams* codec_params) { - if (codec_inst_ptr_ == NULL) { - return -1; - } - - // set decoder sampling frequency. - if (codec_params->codec_inst.plfreq == 32000 || - codec_params->codec_inst.plfreq == 48000) { - UpdateDecoderSampFreq(ACMCodecDB::kISACSWB); - } else { - UpdateDecoderSampFreq(ACMCodecDB::kISAC); - } - - // in a one-way communication we may never register send-codec. - // However we like that the BWE to work properly so it has to - // be initialized. The BWE is initialized when iSAC encoder is initialized. - // Therefore, we need this. - if (!encoder_initialized_) { - // Since we don't require a valid rate or a valid packet size when - // initializing the decoder, we set valid values before initializing encoder - codec_params->codec_inst.rate = kIsacWbDefaultRate; - codec_params->codec_inst.pacsize = kIsacPacSize960; - if (InternalInitEncoder(codec_params) < 0) { - return -1; - } - encoder_initialized_ = true; - } - - return ACM_ISAC_DECODERINIT(codec_inst_ptr_->inst); -} - int16_t ACMISAC::InternalCreateEncoder() { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (codec_inst_ptr_ == NULL) { return -1; } @@ -493,19 +424,6 @@ int16_t ACMISAC::InternalCreateEncoder() { return status; } -void ACMISAC::DestructEncoderSafe() { - // codec with shared instance cannot delete. - encoder_initialized_ = false; - return; -} - -void ACMISAC::InternalDestructEncoderInst(void* ptr_inst) { - if (ptr_inst != NULL) { - ACM_ISAC_FREE(static_cast<ACM_ISAC_STRUCT *>(ptr_inst)); - } - return; -} - int16_t ACMISAC::Transcode(uint8_t* bitstream, int16_t* bitstream_len_byte, int16_t q_bwe, @@ -513,6 +431,7 @@ int16_t ACMISAC::Transcode(uint8_t* bitstream, bool is_red) { int16_t jitter_info = 0; // transcode from a higher rate to lower rate sanity check + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (codec_inst_ptr_ == NULL) { return -1; } @@ -530,7 +449,27 @@ int16_t ACMISAC::Transcode(uint8_t* bitstream, } } +void ACMISAC::UpdateFrameLen() { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + frame_len_smpl_ = ACM_ISAC_GETNEWFRAMELEN(codec_inst_ptr_->inst); + encoder_params_.codec_inst.pacsize = frame_len_smpl_; +} + +void ACMISAC::DestructEncoderSafe() { + // codec with shared instance cannot delete. + encoder_initialized_ = false; + return; +} + +void ACMISAC::InternalDestructEncoderInst(void* ptr_inst) { + if (ptr_inst != NULL) { + ACM_ISAC_FREE(static_cast<ACM_ISAC_STRUCT *>(ptr_inst)); + } + return; +} + int16_t ACMISAC::SetBitRateSafe(int32_t bit_rate) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (codec_inst_ptr_ == NULL) { return -1; } @@ -594,6 +533,7 @@ int32_t ACMISAC::GetEstimatedBandwidthSafe() { int samp_rate; // Get bandwidth information + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); ACM_ISAC_GETSENDBWE(codec_inst_ptr_->inst, &bandwidth_index, &delay_index); // Validy check of index @@ -615,6 +555,7 @@ int32_t ACMISAC::SetEstimatedBandwidthSafe(int32_t estimated_bandwidth) { int16_t bandwidth_index; // Check sample frequency and choose appropriate table + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); samp_rate = ACM_ISAC_GETENCSAMPRATE(codec_inst_ptr_->inst); if (samp_rate == 16000) { @@ -657,6 +598,7 @@ int32_t ACMISAC::GetRedPayloadSafe( return -1; #else uint8_t* red_payload, int16_t* payload_bytes) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); int16_t bytes = WebRtcIsac_GetRedPayload( codec_inst_ptr_->inst, reinterpret_cast<int16_t*>(red_payload)); @@ -672,6 +614,7 @@ int16_t ACMISAC::UpdateDecoderSampFreq( #ifdef WEBRTC_CODEC_ISAC int16_t codec_id) { // The decoder supports only wideband and super-wideband. + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (ACMCodecDB::kISAC == codec_id) { return WebRtcIsac_SetDecSampRate(codec_inst_ptr_->inst, 16000); } else if (ACMCodecDB::kISACSWB == codec_id || @@ -700,6 +643,7 @@ int16_t ACMISAC::UpdateEncoderSampFreq( in_audio_ix_read_ = 0; in_audio_ix_write_ = 0; in_timestamp_ix_write_ = 0; + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); if (WebRtcIsac_SetEncSampRate(codec_inst_ptr_->inst, encoder_samp_freq_hz) < 0) { return -1; @@ -718,6 +662,7 @@ int16_t ACMISAC::UpdateEncoderSampFreq( } int16_t ACMISAC::EncoderSampFreq(uint16_t* samp_freq_hz) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); *samp_freq_hz = ACM_ISAC_GETENCSAMPRATE(codec_inst_ptr_->inst); return 0; } @@ -730,6 +675,7 @@ int32_t ACMISAC::ConfigISACBandwidthEstimator( { uint16_t samp_freq_hz; EncoderSampFreq(&samp_freq_hz); + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); // TODO(turajs): at 32kHz we hardcode calling with 30ms and enforce // the frame-size otherwise we might get error. Revise if // control-bwe is changed. @@ -749,26 +695,25 @@ int32_t ACMISAC::ConfigISACBandwidthEstimator( return -1; } UpdateFrameLen(); + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); ACM_ISAC_GETSENDBITRATE(codec_inst_ptr_->inst, &isac_current_bn_); return 0; } int32_t ACMISAC::SetISACMaxPayloadSize(const uint16_t max_payload_len_bytes) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); return ACM_ISAC_SETMAXPAYLOADSIZE(codec_inst_ptr_->inst, max_payload_len_bytes); } int32_t ACMISAC::SetISACMaxRate(const uint32_t max_rate_bit_per_sec) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); return ACM_ISAC_SETMAXRATE(codec_inst_ptr_->inst, max_rate_bit_per_sec); } -void ACMISAC::UpdateFrameLen() { - frame_len_smpl_ = ACM_ISAC_GETNEWFRAMELEN(codec_inst_ptr_->inst); - encoder_params_.codec_inst.pacsize = frame_len_smpl_; -} - void ACMISAC::CurrentRate(int32_t* rate_bit_per_sec) { if (isac_coding_mode_ == ADAPTIVE) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); ACM_ISAC_GETSENDBITRATE(codec_inst_ptr_->inst, rate_bit_per_sec); } } @@ -784,12 +729,71 @@ int16_t ACMISAC::REDPayloadISAC(const int32_t isac_rate, return status; } -AudioDecoder* ACMISAC::Decoder(int codec_id) { - if (audio_decoder_) - return audio_decoder_; +int ACMISAC::Decode(const uint8_t* encoded, + size_t encoded_len, + int16_t* decoded, + SpeechType* speech_type) { + int16_t temp_type; + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + int ret = + ACM_ISAC_DECODE_B(static_cast<ACM_ISAC_STRUCT*>(codec_inst_ptr_->inst), + reinterpret_cast<const uint16_t*>(encoded), + static_cast<int16_t>(encoded_len), + decoded, + &temp_type); + *speech_type = ConvertSpeechType(temp_type); + return ret; +} + +int ACMISAC::DecodePlc(int num_frames, int16_t* decoded) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + return ACM_ISAC_DECODEPLC( + static_cast<ACM_ISAC_STRUCT*>(codec_inst_ptr_->inst), + decoded, + static_cast<int16_t>(num_frames)); +} + +int ACMISAC::IncomingPacket(const uint8_t* payload, + size_t payload_len, + uint16_t rtp_sequence_number, + uint32_t rtp_timestamp, + uint32_t arrival_timestamp) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + return ACM_ISAC_DECODE_BWE( + static_cast<ACM_ISAC_STRUCT*>(codec_inst_ptr_->inst), + reinterpret_cast<const uint16_t*>(payload), + static_cast<uint32_t>(payload_len), + rtp_sequence_number, + rtp_timestamp, + arrival_timestamp); +} + +int ACMISAC::DecodeRedundant(const uint8_t* encoded, + size_t encoded_len, + int16_t* decoded, + SpeechType* speech_type) { + int16_t temp_type = 1; // Default is speech. + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + int16_t ret = + ACM_ISAC_DECODERCU(static_cast<ACM_ISAC_STRUCT*>(codec_inst_ptr_->inst), + reinterpret_cast<const uint16_t*>(encoded), + static_cast<int16_t>(encoded_len), + decoded, + &temp_type); + *speech_type = ConvertSpeechType(temp_type); + return ret; +} + +int ACMISAC::ErrorCode() { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); + return ACM_ISAC_GETERRORCODE( + static_cast<ACM_ISAC_STRUCT*>(codec_inst_ptr_->inst)); +} +AudioDecoder* ACMISAC::Decoder(int codec_id) { // Create iSAC instance if it does not exist. if (!encoder_exist_) { + CriticalSectionScoped lock(codec_inst_crit_sect_.get()); assert(codec_inst_ptr_->inst == NULL); encoder_initialized_ = false; decoder_initialized_ = false; @@ -822,8 +826,7 @@ AudioDecoder* ACMISAC::Decoder(int codec_id) { decoder_initialized_ = true; } - audio_decoder_ = new AcmAudioDecoderIsac(codec_id, codec_inst_ptr_->inst); - return audio_decoder_; + return this; } #endif diff --git a/modules/audio_coding/main/acm2/acm_isac.h b/modules/audio_coding/main/acm2/acm_isac.h index a3227d5d..3249526f 100644 --- a/modules/audio_coding/main/acm2/acm_isac.h +++ b/modules/audio_coding/main/acm2/acm_isac.h @@ -12,86 +12,119 @@ #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_ISAC_H_ #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { +class CriticalSectionWrapper; + namespace acm2 { struct ACMISACInst; -class AcmAudioDecoderIsac; enum IsacCodingMode { ADAPTIVE, CHANNEL_INDEPENDENT }; -class ACMISAC : public ACMGenericCodec { +class ACMISAC : public ACMGenericCodec, AudioDecoder { public: explicit ACMISAC(int16_t codec_id); ~ACMISAC(); - // for FEC - ACMGenericCodec* CreateInstance(void); + int16_t InternalInitDecoder(WebRtcACMCodecParams* codec_params); - int16_t InternalEncode(uint8_t* bitstream, int16_t* bitstream_len_byte); + // Methods below are inherited from ACMGenericCodec. + ACMGenericCodec* CreateInstance(void) OVERRIDE; - int16_t InternalInitEncoder(WebRtcACMCodecParams* codec_params); + int16_t InternalEncode(uint8_t* bitstream, + int16_t* bitstream_len_byte) OVERRIDE; - int16_t InternalInitDecoder(WebRtcACMCodecParams* codec_params); + int16_t InternalInitEncoder(WebRtcACMCodecParams* codec_params) OVERRIDE; - int16_t UpdateDecoderSampFreq(int16_t codec_id); + int16_t UpdateDecoderSampFreq(int16_t codec_id) OVERRIDE; - int16_t UpdateEncoderSampFreq(uint16_t samp_freq_hz); + int16_t UpdateEncoderSampFreq(uint16_t samp_freq_hz) OVERRIDE; - int16_t EncoderSampFreq(uint16_t* samp_freq_hz); + int16_t EncoderSampFreq(uint16_t* samp_freq_hz) OVERRIDE; int32_t ConfigISACBandwidthEstimator(const uint8_t init_frame_size_msec, const uint16_t init_rate_bit_per_sec, - const bool enforce_frame_size); + const bool enforce_frame_size) OVERRIDE; - int32_t SetISACMaxPayloadSize(const uint16_t max_payload_len_bytes); + int32_t SetISACMaxPayloadSize(const uint16_t max_payload_len_bytes) OVERRIDE; - int32_t SetISACMaxRate(const uint32_t max_rate_bit_per_sec); + int32_t SetISACMaxRate(const uint32_t max_rate_bit_per_sec) OVERRIDE; int16_t REDPayloadISAC(const int32_t isac_rate, const int16_t isac_bw_estimate, uint8_t* payload, - int16_t* payload_len_bytes); + int16_t* payload_len_bytes) OVERRIDE; - protected: - void DestructEncoderSafe(); + // Methods below are inherited from AudioDecoder. + virtual int Decode(const uint8_t* encoded, + size_t encoded_len, + int16_t* decoded, + SpeechType* speech_type) OVERRIDE; - int16_t SetBitRateSafe(const int32_t bit_rate); + virtual bool HasDecodePlc() const OVERRIDE { return true; } - int32_t GetEstimatedBandwidthSafe(); + virtual int DecodePlc(int num_frames, int16_t* decoded) OVERRIDE; - int32_t SetEstimatedBandwidthSafe(int32_t estimated_bandwidth); + virtual int Init() OVERRIDE { return 0; } - int32_t GetRedPayloadSafe(uint8_t* red_payload, int16_t* payload_bytes); + virtual int IncomingPacket(const uint8_t* payload, + size_t payload_len, + uint16_t rtp_sequence_number, + uint32_t rtp_timestamp, + uint32_t arrival_timestamp) OVERRIDE; - int16_t InternalCreateEncoder(); + virtual int DecodeRedundant(const uint8_t* encoded, + size_t encoded_len, + int16_t* decoded, + SpeechType* speech_type) OVERRIDE; - void InternalDestructEncoderInst(void* ptr_inst); + virtual int ErrorCode() OVERRIDE; + protected: int16_t Transcode(uint8_t* bitstream, int16_t* bitstream_len_byte, int16_t q_bwe, int32_t rate, bool is_red); - void CurrentRate(int32_t* rate_bit_per_sec); - void UpdateFrameLen(); - virtual AudioDecoder* Decoder(int codec_id); + // Methods below are inherited from ACMGenericCodec. + void DestructEncoderSafe() OVERRIDE; + + int16_t SetBitRateSafe(const int32_t bit_rate) OVERRIDE; + + int32_t GetEstimatedBandwidthSafe() OVERRIDE; + + int32_t SetEstimatedBandwidthSafe(int32_t estimated_bandwidth) OVERRIDE; + + int32_t GetRedPayloadSafe(uint8_t* red_payload, + int16_t* payload_bytes) OVERRIDE; + + int16_t InternalCreateEncoder() OVERRIDE; + + void InternalDestructEncoderInst(void* ptr_inst) OVERRIDE; + + void CurrentRate(int32_t* rate_bit_per_sec) OVERRIDE; + + virtual AudioDecoder* Decoder(int codec_id) OVERRIDE; - ACMISACInst* codec_inst_ptr_; + // |codec_inst_crit_sect_| protects |codec_inst_ptr_|. + const scoped_ptr<CriticalSectionWrapper> codec_inst_crit_sect_; + ACMISACInst* codec_inst_ptr_ GUARDED_BY(codec_inst_crit_sect_); bool is_enc_initialized_; IsacCodingMode isac_coding_mode_; bool enforce_frame_size_; int32_t isac_current_bn_; uint16_t samples_in_10ms_audio_; - AcmAudioDecoderIsac* audio_decoder_; bool decoder_initialized_; }; diff --git a/modules/audio_coding/main/acm2/acm_receiver.cc b/modules/audio_coding/main/acm2/acm_receiver.cc index 052bd4fc..cb7c4184 100644 --- a/modules/audio_coding/main/acm2/acm_receiver.cc +++ b/modules/audio_coding/main/acm2/acm_receiver.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/main/acm2/nack.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" @@ -118,16 +118,16 @@ bool IsCng(int codec_id) { } // namespace AcmReceiver::AcmReceiver(const AudioCodingModule::Config& config) - : id_(config.id), - neteq_(NetEq::Create(config.neteq_config)), + : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), + id_(config.id), last_audio_decoder_(-1), // Invalid value. - decode_lock_(RWLockWrapper::CreateRWLock()), - neteq_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), - vad_enabled_(true), previous_audio_activity_(AudioFrame::kVadPassive), current_sample_rate_hz_(config.neteq_config.sample_rate_hz), nack_(), nack_enabled_(false), + neteq_(NetEq::Create(config.neteq_config)), + decode_lock_(RWLockWrapper::CreateRWLock()), + vad_enabled_(true), clock_(config.clock), av_sync_(false), initial_delay_manager_(), @@ -150,7 +150,6 @@ AcmReceiver::AcmReceiver(const AudioCodingModule::Config& config) AcmReceiver::~AcmReceiver() { delete neteq_; delete decode_lock_; - delete neteq_crit_sect_; } int AcmReceiver::SetMinimumDelay(int delay_ms) { @@ -164,7 +163,7 @@ int AcmReceiver::SetInitialDelay(int delay_ms) { if (delay_ms < 0 || delay_ms > 10000) { return -1; } - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (delay_ms == 0) { av_sync_ = false; @@ -208,7 +207,7 @@ int AcmReceiver::LeastRequiredDelayMs() const { } int AcmReceiver::current_sample_rate_hz() const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); return current_sample_rate_hz_; } @@ -271,7 +270,7 @@ int AcmReceiver::InsertPacket(const WebRtcRTPHeader& rtp_header, const RTPHeader* header = &rtp_header.header; // Just a shorthand. { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); int codec_id = RtpHeaderToCodecIndex(*header, incoming_payload); if (codec_id < 0) { @@ -330,7 +329,7 @@ int AcmReceiver::InsertPacket(const WebRtcRTPHeader& rtp_header, rtp_header, receive_timestamp, packet_type, new_codec, sample_rate_hz, missing_packets_sync_stream_.get()); } - } + } // |crit_sect_| is released. { WriteLockScoped lock_codecs(*decode_lock_); // Lock to prevent an encoding. @@ -361,7 +360,7 @@ int AcmReceiver::GetAudio(int desired_freq_hz, AudioFrame* audio_frame) { { // Accessing members, take the lock. - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (av_sync_) { assert(initial_delay_manager_.get()); @@ -406,7 +405,7 @@ int AcmReceiver::GetAudio(int desired_freq_hz, AudioFrame* audio_frame) { } // Accessing members, take the lock. - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); // Update NACK. int decoded_sequence_num = 0; @@ -501,7 +500,7 @@ int32_t AcmReceiver::AddCodec(int acm_codec_id, neteq_decoder = kDecoderOpus_2ch; } - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); // The corresponding NetEq decoder ID. // If this coder has been registered before. @@ -547,13 +546,13 @@ int32_t AcmReceiver::AddCodec(int acm_codec_id, void AcmReceiver::EnableVad() { neteq_->EnableVad(); - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); vad_enabled_ = true; } void AcmReceiver::DisableVad() { neteq_->DisableVad(); - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); vad_enabled_ = false; } @@ -565,7 +564,7 @@ void AcmReceiver::FlushBuffers() { // many as it can. int AcmReceiver::RemoveAllCodecs() { int ret_val = 0; - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); for (int n = 0; n < ACMCodecDB::kMaxNumCodecs; ++n) { if (decoders_[n].registered) { if (neteq_->RemovePayloadType(decoders_[n].payload_type) == 0) { @@ -591,7 +590,7 @@ int AcmReceiver::RemoveCodec(uint8_t payload_type) { LOG_FERR1(LS_ERROR, "AcmReceiver::RemoveCodec", payload_type); return -1; } - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); decoders_[codec_index].registered = false; if (last_audio_decoder_ == codec_index) last_audio_decoder_ = -1; // Codec is removed, invalidate last decoder. @@ -599,7 +598,7 @@ int AcmReceiver::RemoveCodec(uint8_t payload_type) { } void AcmReceiver::set_id(int id) { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); id_ = id; } @@ -614,12 +613,12 @@ bool AcmReceiver::GetPlayoutTimestamp(uint32_t* timestamp) { } int AcmReceiver::last_audio_codec_id() const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); return last_audio_decoder_; } int AcmReceiver::last_audio_payload_type() const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (last_audio_decoder_ < 0) return -1; assert(decoders_[last_audio_decoder_].registered); @@ -627,7 +626,7 @@ int AcmReceiver::last_audio_payload_type() const { } int AcmReceiver::RedPayloadType() const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (ACMCodecDB::kRED < 0 || !decoders_[ACMCodecDB::kRED].registered) { LOG_F(LS_WARNING) << "RED is not registered."; @@ -637,7 +636,7 @@ int AcmReceiver::RedPayloadType() const { } int AcmReceiver::LastAudioCodec(CodecInst* codec) const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (last_audio_decoder_ < 0) { return -1; } @@ -692,7 +691,7 @@ void AcmReceiver::NetworkStatistics(ACMNetworkStatistics* acm_stat) { int AcmReceiver::DecoderByPayloadType(uint8_t payload_type, CodecInst* codec) const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); int codec_index = PayloadType2CodecIndex(payload_type); if (codec_index < 0) { LOG_FERR1(LS_ERROR, "AcmReceiver::DecoderByPayloadType", payload_type); @@ -718,7 +717,7 @@ int AcmReceiver::EnableNack(size_t max_nack_list_size) { if (max_nack_list_size == 0 || max_nack_list_size > Nack::kNackListSizeLimit) return -1; - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (!nack_enabled_) { nack_.reset(Nack::Create(kNackThresholdPackets)); nack_enabled_ = true; @@ -734,14 +733,14 @@ int AcmReceiver::EnableNack(size_t max_nack_list_size) { } void AcmReceiver::DisableNack() { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); nack_.reset(); // Memory is released. nack_enabled_ = false; } std::vector<uint16_t> AcmReceiver::GetNackList( int round_trip_time_ms) const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); if (round_trip_time_ms < 0) { WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_, "GetNackList: round trip time cannot be negative." @@ -757,7 +756,7 @@ std::vector<uint16_t> AcmReceiver::GetNackList( void AcmReceiver::ResetInitialDelay() { { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); av_sync_ = false; initial_delay_manager_.reset(NULL); missing_packets_sync_stream_.reset(NULL); @@ -860,7 +859,7 @@ void AcmReceiver::InsertStreamOfSyncPackets( void AcmReceiver::GetDecodingCallStatistics( AudioDecodingCallStats* stats) const { - CriticalSectionScoped lock(neteq_crit_sect_); + CriticalSectionScoped lock(crit_sect_.get()); *stats = call_stats_.GetDecodingStatistics(); } diff --git a/modules/audio_coding/main/acm2/acm_receiver.h b/modules/audio_coding/main/acm2/acm_receiver.h index 748744a4..b6898f73 100644 --- a/modules/audio_coding/main/acm2/acm_receiver.h +++ b/modules/audio_coding/main/acm2/acm_receiver.h @@ -20,9 +20,10 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/main/acm2/initial_delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -327,7 +328,8 @@ class AcmReceiver { private: int PayloadType2CodecIndex(uint8_t payload_type) const; - bool GetSilence(int desired_sample_rate_hz, AudioFrame* frame); + bool GetSilence(int desired_sample_rate_hz, AudioFrame* frame) + EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); int GetNumSyncPacketToInsert(uint16_t received_squence_number); @@ -338,21 +340,23 @@ class AcmReceiver { void InsertStreamOfSyncPackets(InitialDelayManager::SyncStream* sync_stream); - int id_; + scoped_ptr<CriticalSectionWrapper> crit_sect_; + int id_; // TODO(henrik.lundin) Make const. + int last_audio_decoder_ GUARDED_BY(crit_sect_); + AudioFrame::VADActivity previous_audio_activity_ GUARDED_BY(crit_sect_); + int current_sample_rate_hz_ GUARDED_BY(crit_sect_); + ACMResampler resampler_ GUARDED_BY(crit_sect_); + // Used in GetAudio, declared as member to avoid allocating every 10ms. + // TODO(henrik.lundin) Stack-allocate in GetAudio instead? + int16_t audio_buffer_[AudioFrame::kMaxDataSizeSamples] GUARDED_BY(crit_sect_); + scoped_ptr<Nack> nack_ GUARDED_BY(crit_sect_); + bool nack_enabled_ GUARDED_BY(crit_sect_); + CallStatistics call_stats_ GUARDED_BY(crit_sect_); NetEq* neteq_; Decoder decoders_[ACMCodecDB::kMaxNumCodecs]; - int last_audio_decoder_; RWLockWrapper* decode_lock_; - CriticalSectionWrapper* neteq_crit_sect_; bool vad_enabled_; - AudioFrame::VADActivity previous_audio_activity_; - int current_sample_rate_hz_; - ACMResampler resampler_; - // Used in GetAudio, declared as member to avoid allocating every 10ms. - int16_t audio_buffer_[AudioFrame::kMaxDataSizeSamples]; - scoped_ptr<Nack> nack_; - bool nack_enabled_; - Clock* clock_; + Clock* clock_; // TODO(henrik.lundin) Make const if possible. // Indicates if a non-zero initial delay is set, and the receiver is in // AV-sync mode. @@ -366,8 +370,6 @@ class AcmReceiver { // initial delay is set. scoped_ptr<InitialDelayManager::SyncStream> missing_packets_sync_stream_; scoped_ptr<InitialDelayManager::SyncStream> late_packets_sync_stream_; - - CallStatistics call_stats_; }; } // namespace acm2 diff --git a/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/modules/audio_coding/main/acm2/acm_receiver_unittest.cc index c55eef95..4234f146 100644 --- a/modules/audio_coding/main/acm2/acm_receiver_unittest.cc +++ b/modules/audio_coding/main/acm2/acm_receiver_unittest.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/test_suite.h" diff --git a/modules/audio_coding/main/acm2/audio_coding_module.gypi b/modules/audio_coding/main/acm2/audio_coding_module.gypi index 459313bb..90dad6c5 100644 --- a/modules/audio_coding/main/acm2/audio_coding_module.gypi +++ b/modules/audio_coding/main/acm2/audio_coding_module.gypi @@ -36,7 +36,7 @@ ], 'dependencies': [ '<@(audio_coding_dependencies)', - 'NetEq4', + 'neteq', ], 'include_dirs': [ '../interface', diff --git a/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc index 502d79fb..37cd70e5 100644 --- a/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc @@ -8,17 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> +#include <vector> + #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" +#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/compile_assert.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" namespace webrtc { @@ -76,6 +82,7 @@ class PacketizationCallbackStub : public AudioPacketizationCallback { const RTPFragmentationHeader* fragmentation) OVERRIDE { CriticalSectionScoped lock(crit_sect_.get()); ++num_calls_; + last_payload_vec_.assign(payload_data, payload_data + payload_len_bytes); return 0; } @@ -84,8 +91,19 @@ class PacketizationCallbackStub : public AudioPacketizationCallback { return num_calls_; } + int last_payload_len_bytes() const { + CriticalSectionScoped lock(crit_sect_.get()); + return last_payload_vec_.size(); + } + + void SwapBuffers(std::vector<uint8_t>* payload) { + CriticalSectionScoped lock(crit_sect_.get()); + last_payload_vec_.swap(*payload); + } + private: int num_calls_ GUARDED_BY(crit_sect_); + std::vector<uint8_t> last_payload_vec_ GUARDED_BY(crit_sect_); const scoped_ptr<CriticalSectionWrapper> crit_sect_; }; @@ -103,16 +121,12 @@ class AudioCodingModuleTest : public ::testing::Test { void SetUp() { acm_.reset(AudioCodingModule::Create(id_, clock_)); - AudioCodingModule::Codec("L16", &codec_, kSampleRateHz, 1); - codec_.pltype = kPayloadType; - - // Register L16 codec in ACM. - ASSERT_EQ(0, acm_->RegisterReceiveCodec(codec_)); - ASSERT_EQ(0, acm_->RegisterSendCodec(codec_)); + RegisterCodec(); rtp_utility_->Populate(&rtp_header_); input_frame_.sample_rate_hz_ = kSampleRateHz; + input_frame_.num_channels_ = 1; input_frame_.samples_per_channel_ = kSampleRateHz * 10 / 1000; // 10 ms. COMPILE_ASSERT(kSampleRateHz * 10 / 1000 <= AudioFrame::kMaxDataSizeSamples, audio_frame_too_small); @@ -123,26 +137,38 @@ class AudioCodingModuleTest : public ::testing::Test { ASSERT_EQ(0, acm_->RegisterTransportCallback(&packet_cb_)); } - void InsertPacketAndPullAudio() { + virtual void RegisterCodec() { + AudioCodingModule::Codec("L16", &codec_, kSampleRateHz, 1); + codec_.pltype = kPayloadType; + + // Register L16 codec in ACM. + ASSERT_EQ(0, acm_->RegisterReceiveCodec(codec_)); + ASSERT_EQ(0, acm_->RegisterSendCodec(codec_)); + } + + virtual void InsertPacketAndPullAudio() { InsertPacket(); PullAudio(); } - void InsertPacket() { + virtual void InsertPacket() { const uint8_t kPayload[kPayloadSizeBytes] = {0}; ASSERT_EQ(0, acm_->IncomingPacket(kPayload, kPayloadSizeBytes, rtp_header_)); rtp_utility_->Forward(&rtp_header_); } - void PullAudio() { + virtual void PullAudio() { AudioFrame audio_frame; ASSERT_EQ(0, acm_->PlayoutData10Ms(-1, &audio_frame)); } - void InsertAudio() { ASSERT_EQ(0, acm_->Add10MsData(input_frame_)); } + virtual void InsertAudio() { + ASSERT_EQ(0, acm_->Add10MsData(input_frame_)); + input_frame_.timestamp_ += kNumSamples10ms; + } - void Encode() { + virtual void Encode() { int32_t encoded_bytes = acm_->Process(); // Expect to get one packet with two bytes per sample, or no packet at all, // depending on how many 10 ms blocks go into |codec_.pacsize|. @@ -244,10 +270,12 @@ TEST_F(AudioCodingModuleTest, FailOnZeroDesiredFrequency) { EXPECT_EQ(-1, acm_->PlayoutData10Ms(0, &audio_frame)); } +// A multi-threaded test for ACM. This base class is using the PCM16b 16 kHz +// codec, while the derive class AcmIsacMtTest is using iSAC. class AudioCodingModuleMtTest : public AudioCodingModuleTest { protected: - static const int kNumPackets = 10000; - static const int kNumPullCalls = 10000; + static const int kNumPackets = 500; + static const int kNumPullCalls = 500; AudioCodingModuleMtTest() : AudioCodingModuleTest(), @@ -270,13 +298,15 @@ class AudioCodingModuleMtTest : public AudioCodingModuleTest { crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), next_insert_packet_time_ms_(0), fake_clock_(new SimulatedClock(0)) { - clock_ = fake_clock_; + clock_ = fake_clock_.get(); } - ~AudioCodingModuleMtTest() {} - void SetUp() { AudioCodingModuleTest::SetUp(); + StartThreads(); + } + + void StartThreads() { unsigned int thread_id = 0; ASSERT_TRUE(send_thread_->Start(thread_id)); ASSERT_TRUE(insert_packet_thread_->Start(thread_id)); @@ -290,9 +320,21 @@ class AudioCodingModuleMtTest : public AudioCodingModuleTest { insert_packet_thread_->Stop(); } - EventTypeWrapper RunTest() { return test_complete_->Wait(60000); } + EventTypeWrapper RunTest() { + return test_complete_->Wait(10 * 60 * 1000); // 10 minutes' timeout. + } + + virtual bool TestDone() { + if (packet_cb_.num_calls() > kNumPackets) { + CriticalSectionScoped lock(crit_sect_.get()); + if (pull_audio_count_ > kNumPullCalls) { + // Both conditions for completion are met. End the test. + return true; + } + } + return false; + } - private: static bool CbSendThread(void* context) { return reinterpret_cast<AudioCodingModuleMtTest*>(context)->CbSendImpl(); } @@ -300,15 +342,16 @@ class AudioCodingModuleMtTest : public AudioCodingModuleTest { // The send thread doesn't have to care about the current simulated time, // since only the AcmReceiver is using the clock. bool CbSendImpl() { + SleepMs(1); + if (HasFatalFailure()) { + // End the test early if a fatal failure (ASSERT_*) has occurred. + test_complete_->Set(); + } ++send_count_; InsertAudio(); Encode(); - if (packet_cb_.num_calls() > kNumPackets) { - CriticalSectionScoped lock(crit_sect_.get()); - if (pull_audio_count_ > kNumPullCalls) { - // Both conditions for completion are met. End the test. - test_complete_->Set(); - } + if (TestDone()) { + test_complete_->Set(); } return true; } @@ -319,6 +362,7 @@ class AudioCodingModuleMtTest : public AudioCodingModuleTest { } bool CbInsertPacketImpl() { + SleepMs(1); { CriticalSectionScoped lock(crit_sect_.get()); if (clock_->TimeInMilliseconds() < next_insert_packet_time_ms_) { @@ -338,6 +382,7 @@ class AudioCodingModuleMtTest : public AudioCodingModuleTest { } bool CbPullAudioImpl() { + SleepMs(1); { CriticalSectionScoped lock(crit_sect_.get()); // Don't let the insert thread fall behind. @@ -361,10 +406,108 @@ class AudioCodingModuleMtTest : public AudioCodingModuleTest { int pull_audio_count_ GUARDED_BY(crit_sect_); const scoped_ptr<CriticalSectionWrapper> crit_sect_; int64_t next_insert_packet_time_ms_ GUARDED_BY(crit_sect_); - SimulatedClock* fake_clock_; + scoped_ptr<SimulatedClock> fake_clock_; +}; + +TEST_F(AudioCodingModuleMtTest, DoTest) { + EXPECT_EQ(kEventSignaled, RunTest()); +} + +// This is a multi-threaded ACM test using iSAC. The test encodes audio +// from a PCM file. The most recent encoded frame is used as input to the +// receiving part. Depending on timing, it may happen that the same RTP packet +// is inserted into the receiver multiple times, but this is a valid use-case, +// and simplifies the test code a lot. +class AcmIsacMtTest : public AudioCodingModuleMtTest { + protected: + static const int kNumPackets = 500; + static const int kNumPullCalls = 500; + + AcmIsacMtTest() + : AudioCodingModuleMtTest(), + last_packet_number_(0) {} + + ~AcmIsacMtTest() {} + + void SetUp() { + AudioCodingModuleTest::SetUp(); + + // Set up input audio source to read from specified file, loop after 5 + // seconds, and deliver blocks of 10 ms. + const std::string input_file_name = + webrtc::test::ResourcePath("audio_coding/speech_mono_16kHz", "pcm"); + audio_loop_.Init(input_file_name, 5 * kSampleRateHz, kNumSamples10ms); + + // Generate one packet to have something to insert. + int loop_counter = 0; + while (packet_cb_.last_payload_len_bytes() == 0) { + InsertAudio(); + Encode(); + ASSERT_LT(loop_counter++, 10); + } + // Set |last_packet_number_| to one less that |num_calls| so that the packet + // will be fetched in the next InsertPacket() call. + last_packet_number_ = packet_cb_.num_calls() - 1; + + StartThreads(); + } + + virtual void RegisterCodec() { + COMPILE_ASSERT(kSampleRateHz == 16000, test_designed_for_isac_16khz); + AudioCodingModule::Codec("ISAC", &codec_, kSampleRateHz, 1); + codec_.pltype = kPayloadType; + + // Register iSAC codec in ACM, effectively unregistering the PCM16B codec + // registered in AudioCodingModuleTest::SetUp(); + ASSERT_EQ(0, acm_->RegisterReceiveCodec(codec_)); + ASSERT_EQ(0, acm_->RegisterSendCodec(codec_)); + } + + void InsertPacket() { + int num_calls = packet_cb_.num_calls(); // Store locally for thread safety. + if (num_calls > last_packet_number_) { + // Get the new payload out from the callback handler. + // Note that since we swap buffers here instead of directly inserting + // a pointer to the data in |packet_cb_|, we avoid locking the callback + // for the duration of the IncomingPacket() call. + packet_cb_.SwapBuffers(&last_payload_vec_); + ASSERT_GT(last_payload_vec_.size(), 0u); + rtp_utility_->Forward(&rtp_header_); + last_packet_number_ = num_calls; + } + ASSERT_GT(last_payload_vec_.size(), 0u); + ASSERT_EQ( + 0, + acm_->IncomingPacket( + &last_payload_vec_[0], last_payload_vec_.size(), rtp_header_)); + } + + void InsertAudio() { + memcpy(input_frame_.data_, audio_loop_.GetNextBlock(), kNumSamples10ms); + AudioCodingModuleTest::InsertAudio(); + } + + void Encode() { ASSERT_GE(acm_->Process(), 0); } + + // This method is the same as AudioCodingModuleMtTest::TestDone(), but here + // it is using the constants defined in this class (i.e., shorter test run). + virtual bool TestDone() { + if (packet_cb_.num_calls() > kNumPackets) { + CriticalSectionScoped lock(crit_sect_.get()); + if (pull_audio_count_ > kNumPullCalls) { + // Both conditions for completion are met. End the test. + return true; + } + } + return false; + } + + int last_packet_number_; + std::vector<uint8_t> last_payload_vec_; + test::AudioLoop audio_loop_; }; -TEST_F(AudioCodingModuleMtTest, DISABLED_DoTest) { +TEST_F(AcmIsacMtTest, DoTest) { EXPECT_EQ(kEventSignaled, RunTest()); } diff --git a/modules/audio_coding/main/interface/audio_coding_module.h b/modules/audio_coding/main/interface/audio_coding_module.h index 1bfc0d35..cb0953aa 100644 --- a/modules/audio_coding/main/interface/audio_coding_module.h +++ b/modules/audio_coding/main/interface/audio_coding_module.h @@ -15,7 +15,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/interface/module.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/typedefs.h" diff --git a/modules/audio_coding/neteq4/OWNERS b/modules/audio_coding/neteq/OWNERS index b65d37b7..072e7549 100644 --- a/modules/audio_coding/neteq4/OWNERS +++ b/modules/audio_coding/neteq/OWNERS @@ -3,6 +3,8 @@ tina.legrand@webrtc.org turaj@webrtc.org minyue@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/modules/audio_coding/neteq4/accelerate.cc b/modules/audio_coding/neteq/accelerate.cc index eb546e97..6acd778a 100644 --- a/modules/audio_coding/neteq4/accelerate.cc +++ b/modules/audio_coding/neteq/accelerate.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" diff --git a/modules/audio_coding/neteq4/accelerate.h b/modules/audio_coding/neteq/accelerate.h index 0ee69520..2da99932 100644 --- a/modules/audio_coding/neteq4/accelerate.h +++ b/modules/audio_coding/neteq/accelerate.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ #include <assert.h> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/time_stretch.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/time_stretch.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -74,4 +74,4 @@ struct AccelerateFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ diff --git a/modules/audio_coding/neteq4/audio_classifier.cc b/modules/audio_coding/neteq/audio_classifier.cc index a272fbce..cc4bc97c 100644 --- a/modules/audio_coding/neteq4/audio_classifier.cc +++ b/modules/audio_coding/neteq/audio_classifier.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h" +#include "webrtc/modules/audio_coding/neteq/audio_classifier.h" #include <assert.h> #include <string.h> diff --git a/modules/audio_coding/neteq4/audio_classifier.h b/modules/audio_coding/neteq/audio_classifier.h index 1d041b30..e7b7807d 100644 --- a/modules/audio_coding/neteq4/audio_classifier.h +++ b/modules/audio_coding/neteq/audio_classifier.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ #if defined(__cplusplus) extern "C" { @@ -56,4 +56,4 @@ class AudioClassifier { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ diff --git a/modules/audio_coding/neteq4/audio_classifier_unittest.cc b/modules/audio_coding/neteq/audio_classifier_unittest.cc index 0a667181..cf623ca0 100644 --- a/modules/audio_coding/neteq4/audio_classifier_unittest.cc +++ b/modules/audio_coding/neteq/audio_classifier_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h" +#include "webrtc/modules/audio_coding/neteq/audio_classifier.h" #include <math.h> #include <stdio.h> diff --git a/modules/audio_coding/neteq4/audio_decoder.cc b/modules/audio_coding/neteq/audio_decoder.cc index 2a252e6f..f539bb2e 100644 --- a/modules/audio_coding/neteq4/audio_decoder.cc +++ b/modules/audio_coding/neteq/audio_decoder.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include <assert.h> -#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" +#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/audio_decoder_impl.cc b/modules/audio_coding/neteq/audio_decoder_impl.cc index 94e507e0..6c7269a3 100644 --- a/modules/audio_coding/neteq4/audio_decoder_impl.cc +++ b/modules/audio_coding/neteq/audio_decoder_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" +#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" #include <assert.h> #include <string.h> // memmove diff --git a/modules/audio_coding/neteq4/audio_decoder_impl.h b/modules/audio_coding/neteq/audio_decoder_impl.h index 93f6c9c6..265d660b 100644 --- a/modules/audio_coding/neteq4/audio_decoder_impl.h +++ b/modules/audio_coding/neteq/audio_decoder_impl.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ #include <assert.h> @@ -19,7 +19,7 @@ #include "webrtc/engine_configurations.h" #endif #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -273,4 +273,4 @@ class AudioDecoderCng : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ diff --git a/modules/audio_coding/neteq4/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc index dbd9d121..f82644cb 100644 --- a/modules/audio_coding/neteq4/audio_decoder_unittest.cc +++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" +#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" #include <assert.h> #include <stdlib.h> diff --git a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/modules/audio_coding/neteq/audio_decoder_unittests.isolate index bb57e74b..bb57e74b 100644 --- a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate +++ b/modules/audio_coding/neteq/audio_decoder_unittests.isolate diff --git a/modules/audio_coding/neteq4/audio_multi_vector.cc b/modules/audio_coding/neteq/audio_multi_vector.cc index b49f8b0e..5a208a69 100644 --- a/modules/audio_coding/neteq4/audio_multi_vector.cc +++ b/modules/audio_coding/neteq/audio_multi_vector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include <assert.h> diff --git a/modules/audio_coding/neteq4/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h index 25f45cf2..908de936 100644 --- a/modules/audio_coding/neteq4/audio_multi_vector.h +++ b/modules/audio_coding/neteq/audio_multi_vector.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ #include <string.h> // Access to size_t. #include <vector> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -131,4 +131,4 @@ class AudioMultiVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ diff --git a/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index be05a826..94760385 100644 --- a/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include <assert.h> #include <stdlib.h> diff --git a/modules/audio_coding/neteq4/audio_vector.cc b/modules/audio_coding/neteq/audio_vector.cc index cbd46163..d9fb4e58 100644 --- a/modules/audio_coding/neteq4/audio_vector.cc +++ b/modules/audio_coding/neteq/audio_vector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include <assert.h> diff --git a/modules/audio_coding/neteq4/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h index 265d68e8..f8aabdb8 100644 --- a/modules/audio_coding/neteq4/audio_vector.h +++ b/modules/audio_coding/neteq/audio_vector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ #include <string.h> // Access to size_t. @@ -117,4 +117,4 @@ class AudioVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ diff --git a/modules/audio_coding/neteq4/audio_vector_unittest.cc b/modules/audio_coding/neteq/audio_vector_unittest.cc index de5aac2d..50da1fb4 100644 --- a/modules/audio_coding/neteq4/audio_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include <assert.h> #include <stdlib.h> diff --git a/modules/audio_coding/neteq4/background_noise.cc b/modules/audio_coding/neteq/background_noise.cc index 2dfb3c1f..e00c4f65 100644 --- a/modules/audio_coding/neteq4/background_noise.cc +++ b/modules/audio_coding/neteq/background_noise.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" #include <assert.h> #include <string.h> // memcpy @@ -16,8 +16,8 @@ #include <algorithm> // min, max #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/background_noise.h b/modules/audio_coding/neteq/background_noise.h index 3a63ebb9..8fb310ea 100644 --- a/modules/audio_coding/neteq4/background_noise.h +++ b/modules/audio_coding/neteq/background_noise.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ #include <string.h> // size_t #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -134,4 +134,4 @@ class BackgroundNoise { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ diff --git a/modules/audio_coding/neteq4/background_noise_unittest.cc b/modules/audio_coding/neteq/background_noise_unittest.cc index eb7b9fa1..0aee62c9 100644 --- a/modules/audio_coding/neteq4/background_noise_unittest.cc +++ b/modules/audio_coding/neteq/background_noise_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for BackgroundNoise class. -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "gtest/gtest.h" diff --git a/modules/audio_coding/neteq4/buffer_level_filter.cc b/modules/audio_coding/neteq/buffer_level_filter.cc index 70b49310..0388b195 100644 --- a/modules/audio_coding/neteq4/buffer_level_filter.cc +++ b/modules/audio_coding/neteq/buffer_level_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include <algorithm> // Provide access to std::max. diff --git a/modules/audio_coding/neteq4/buffer_level_filter.h b/modules/audio_coding/neteq/buffer_level_filter.h index 842634c5..48f7f564 100644 --- a/modules/audio_coding/neteq4/buffer_level_filter.h +++ b/modules/audio_coding/neteq/buffer_level_filter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ #include "webrtc/base/constructormagic.h" @@ -44,4 +44,4 @@ class BufferLevelFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ diff --git a/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc index ddaf08d1..9589099d 100644 --- a/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc +++ b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for BufferLevelFilter class. -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include <math.h> // Access to pow function. diff --git a/modules/audio_coding/neteq4/comfort_noise.cc b/modules/audio_coding/neteq/comfort_noise.cc index 360767af..31bb40c9 100644 --- a/modules/audio_coding/neteq4/comfort_noise.cc +++ b/modules/audio_coding/neteq/comfort_noise.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h" +#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" #include <assert.h> #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h index 5c4e1ce0..d4655962 100644 --- a/modules/audio_coding/neteq4/comfort_noise.h +++ b/modules/audio_coding/neteq/comfort_noise.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -70,4 +70,4 @@ class ComfortNoise { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ diff --git a/modules/audio_coding/neteq4/comfort_noise_unittest.cc b/modules/audio_coding/neteq/comfort_noise_unittest.cc index 0e849717..6a1bbe0d 100644 --- a/modules/audio_coding/neteq4/comfort_noise_unittest.cc +++ b/modules/audio_coding/neteq/comfort_noise_unittest.cc @@ -10,11 +10,11 @@ // Unit tests for ComfortNoise class. -#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h" +#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/decision_logic.cc b/modules/audio_coding/neteq/decision_logic.cc index 85edbb4d..5fb054c7 100644 --- a/modules/audio_coding/neteq4/decision_logic.cc +++ b/modules/audio_coding/neteq/decision_logic.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include <algorithm> -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h index 38be6e6b..672ce939 100644 --- a/modules/audio_coding/neteq4/decision_logic.h +++ b/modules/audio_coding/neteq/decision_logic.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -165,4 +165,4 @@ class DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ diff --git a/modules/audio_coding/neteq4/decision_logic_fax.cc b/modules/audio_coding/neteq/decision_logic_fax.cc index 00c8bcf4..08a4c4cb 100644 --- a/modules/audio_coding/neteq4/decision_logic_fax.cc +++ b/modules/audio_coding/neteq/decision_logic_fax.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h" #include <assert.h> #include <algorithm> -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/decision_logic_fax.h b/modules/audio_coding/neteq/decision_logic_fax.h index 2e35d266..01a948fa 100644 --- a/modules/audio_coding/neteq4/decision_logic_fax.h +++ b/modules/audio_coding/neteq/decision_logic_fax.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -60,4 +60,4 @@ class DecisionLogicFax : public DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ diff --git a/modules/audio_coding/neteq4/decision_logic_normal.cc b/modules/audio_coding/neteq/decision_logic_normal.cc index a70f23b7..97a8843a 100644 --- a/modules/audio_coding/neteq4/decision_logic_normal.cc +++ b/modules/audio_coding/neteq/decision_logic_normal.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" #include <assert.h> #include <algorithm> -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/modules/interface/module_common_types.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/decision_logic_normal.h b/modules/audio_coding/neteq/decision_logic_normal.h index 5b21193c..a339d160 100644 --- a/modules/audio_coding/neteq4/decision_logic_normal.h +++ b/modules/audio_coding/neteq/decision_logic_normal.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -104,4 +104,4 @@ class DecisionLogicNormal : public DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ diff --git a/modules/audio_coding/neteq4/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc index 60a4b62a..f9056a6c 100644 --- a/modules/audio_coding/neteq4/decision_logic_unittest.cc +++ b/modules/audio_coding/neteq/decision_logic_unittest.cc @@ -11,12 +11,12 @@ // Unit tests for DecisionLogic class and derived classes. #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/decoder_database.cc b/modules/audio_coding/neteq/decoder_database.cc index 8d87519b..5049962b 100644 --- a/modules/audio_coding/neteq4/decoder_database.cc +++ b/modules/audio_coding/neteq/decoder_database.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include <assert.h> #include <utility> // pair -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/decoder_database.h b/modules/audio_coding/neteq/decoder_database.h index 2e8825ae..8a03f212 100644 --- a/modules/audio_coding/neteq4/decoder_database.h +++ b/modules/audio_coding/neteq/decoder_database.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ #include <map> #include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" // NULL -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -155,4 +155,4 @@ class DecoderDatabase { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ diff --git a/modules/audio_coding/neteq4/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc index 66eddb52..d0c6f5ae 100644 --- a/modules/audio_coding/neteq4/decoder_database_unittest.cc +++ b/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include <assert.h> #include <stdlib.h> @@ -18,7 +18,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" #include "webrtc/test/testsupport/gtest_disable.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/defines.h b/modules/audio_coding/neteq/defines.h index b6f9eb2b..33d1bd9c 100644 --- a/modules/audio_coding/neteq4/defines.h +++ b/modules/audio_coding/neteq/defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ namespace webrtc { @@ -48,4 +48,4 @@ enum Modes { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ diff --git a/modules/audio_coding/neteq4/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc index e80b9de5..a935561e 100644 --- a/modules/audio_coding/neteq4/delay_manager.cc +++ b/modules/audio_coding/neteq/delay_manager.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" #include <assert.h> #include <math.h> @@ -16,7 +16,7 @@ #include <algorithm> // max, min #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/logging.h" diff --git a/modules/audio_coding/neteq4/delay_manager.h b/modules/audio_coding/neteq/delay_manager.h index cc34352b..96b5e19e 100644 --- a/modules/audio_coding/neteq4/delay_manager.h +++ b/modules/audio_coding/neteq/delay_manager.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ #include <string.h> // Provide access to size_t. #include <vector> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -161,4 +161,4 @@ class DelayManager { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ diff --git a/modules/audio_coding/neteq4/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc index 482a65c9..6f973323 100644 --- a/modules/audio_coding/neteq4/delay_manager_unittest.cc +++ b/modules/audio_coding/neteq/delay_manager_unittest.cc @@ -10,13 +10,13 @@ // Unit tests for DelayManager class. -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" #include <math.h> #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/delay_peak_detector.cc b/modules/audio_coding/neteq/delay_peak_detector.cc index fd5b9c08..5996d7d1 100644 --- a/modules/audio_coding/neteq4/delay_peak_detector.cc +++ b/modules/audio_coding/neteq/delay_peak_detector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include <algorithm> // max diff --git a/modules/audio_coding/neteq4/delay_peak_detector.h b/modules/audio_coding/neteq/delay_peak_detector.h index 59d27bc5..8bf6aba8 100644 --- a/modules/audio_coding/neteq4/delay_peak_detector.h +++ b/modules/audio_coding/neteq/delay_peak_detector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ #include <string.h> // size_t @@ -73,4 +73,4 @@ class DelayPeakDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ diff --git a/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc b/modules/audio_coding/neteq/delay_peak_detector_unittest.cc index a3b48209..080309be 100644 --- a/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc +++ b/modules/audio_coding/neteq/delay_peak_detector_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for DelayPeakDetector class. -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "gtest/gtest.h" diff --git a/modules/audio_coding/neteq4/dsp_helper.cc b/modules/audio_coding/neteq/dsp_helper.cc index e1aa0e53..7451ae26 100644 --- a/modules/audio_coding/neteq4/dsp_helper.cc +++ b/modules/audio_coding/neteq/dsp_helper.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include <assert.h> #include <string.h> // Access to memset. diff --git a/modules/audio_coding/neteq4/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h index f2064858..af4f4d6c 100644 --- a/modules/audio_coding/neteq4/dsp_helper.h +++ b/modules/audio_coding/neteq/dsp_helper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ #include <string.h> // Access to size_t. #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -133,4 +133,4 @@ class DspHelper { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ diff --git a/modules/audio_coding/neteq4/dsp_helper_unittest.cc b/modules/audio_coding/neteq/dsp_helper_unittest.cc index 852c2ec9..cbceff61 100644 --- a/modules/audio_coding/neteq4/dsp_helper_unittest.cc +++ b/modules/audio_coding/neteq/dsp_helper_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/dtmf_buffer.cc b/modules/audio_coding/neteq/dtmf_buffer.cc index 1c81ad94..91debee1 100644 --- a/modules/audio_coding/neteq4/dtmf_buffer.cc +++ b/modules/audio_coding/neteq/dtmf_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" #include <assert.h> #include <algorithm> // max diff --git a/modules/audio_coding/neteq4/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h index b901a971..5dd31c2d 100644 --- a/modules/audio_coding/neteq4/dtmf_buffer.h +++ b/modules/audio_coding/neteq/dtmf_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ #include <list> #include <string> // size_t @@ -113,4 +113,4 @@ class DtmfBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ diff --git a/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc b/modules/audio_coding/neteq/dtmf_buffer_unittest.cc index 0b5ed65b..83f98138 100644 --- a/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc +++ b/modules/audio_coding/neteq/dtmf_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" #ifdef WIN32 #include <winsock2.h> // ntohl() diff --git a/modules/audio_coding/neteq4/dtmf_tone_generator.cc b/modules/audio_coding/neteq/dtmf_tone_generator.cc index c85534e9..34c615d7 100644 --- a/modules/audio_coding/neteq4/dtmf_tone_generator.cc +++ b/modules/audio_coding/neteq/dtmf_tone_generator.cc @@ -28,7 +28,7 @@ // 852 Hz 7 8 9 14 // 941 Hz 10 0 11 15 -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" #include <assert.h> diff --git a/modules/audio_coding/neteq4/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h index a0a83f1b..fc1e5e4a 100644 --- a/modules/audio_coding/neteq4/dtmf_tone_generator.h +++ b/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -53,4 +53,4 @@ class DtmfToneGenerator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ diff --git a/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc index 37e8bbda..94f79dc3 100644 --- a/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc +++ b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for DtmfToneGenerator class. -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" #include <math.h> #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/expand.cc b/modules/audio_coding/neteq/expand.cc index 9b08de15..14a77982 100644 --- a/modules/audio_coding/neteq4/expand.cc +++ b/modules/audio_coding/neteq/expand.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/expand.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" #include <assert.h> #include <string.h> // memset @@ -17,10 +17,10 @@ #include <limits> // numeric_limits<T> #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/expand.h b/modules/audio_coding/neteq/expand.h index b5f44065..1acf951b 100644 --- a/modules/audio_coding/neteq4/expand.h +++ b/modules/audio_coding/neteq/expand.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ #include <assert.h> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -184,4 +184,4 @@ struct ExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ diff --git a/modules/audio_coding/neteq4/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc index 353af2cf..bd39f408 100644 --- a/modules/audio_coding/neteq4/expand_unittest.cc +++ b/modules/audio_coding/neteq/expand_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for Expand class. -#include "webrtc/modules/audio_coding/neteq4/expand.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/interface/audio_decoder.h b/modules/audio_coding/neteq/interface/audio_decoder.h index 404572aa..9a2fb8b4 100644 --- a/modules/audio_coding/neteq4/interface/audio_decoder.h +++ b/modules/audio_coding/neteq/interface/audio_decoder.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_ #include <stdlib.h> // NULL @@ -149,4 +149,4 @@ class AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_ diff --git a/modules/audio_coding/neteq4/interface/neteq.h b/modules/audio_coding/neteq/interface/neteq.h index 79a5dfb0..c67ab12c 100644 --- a/modules/audio_coding/neteq4/interface/neteq.h +++ b/modules/audio_coding/neteq/interface/neteq.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_ #include <string.h> // Provide access to size_t. @@ -17,7 +17,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -273,4 +273,4 @@ class NetEq { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_ diff --git a/modules/audio_coding/neteq4/merge.cc b/modules/audio_coding/neteq/merge.cc index 90068bb4..d3d80775 100644 --- a/modules/audio_coding/neteq4/merge.cc +++ b/modules/audio_coding/neteq/merge.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/merge.h" +#include "webrtc/modules/audio_coding/neteq/merge.h" #include <assert.h> #include <string.h> // memmove, memcpy, memset, size_t @@ -16,10 +16,10 @@ #include <algorithm> // min, max #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/merge.h b/modules/audio_coding/neteq/merge.h index 012e0af7..1bf0483d 100644 --- a/modules/audio_coding/neteq4/merge.h +++ b/modules/audio_coding/neteq/merge.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ #include <assert.h> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -107,4 +107,4 @@ class Merge { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ diff --git a/modules/audio_coding/neteq4/merge_unittest.cc b/modules/audio_coding/neteq/merge_unittest.cc index 1d7b1f1f..fb5f789f 100644 --- a/modules/audio_coding/neteq4/merge_unittest.cc +++ b/modules/audio_coding/neteq/merge_unittest.cc @@ -10,15 +10,15 @@ // Unit tests for Merge class. -#include "webrtc/modules/audio_coding/neteq4/merge.h" +#include "webrtc/modules/audio_coding/neteq/merge.h" #include <vector> #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/mock/mock_audio_decoder.h b/modules/audio_coding/neteq/mock/mock_audio_decoder.h index a6d58744..edf3b54e 100644 --- a/modules/audio_coding/neteq4/mock/mock_audio_decoder.h +++ b/modules/audio_coding/neteq/mock/mock_audio_decoder.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_ -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "gmock/gmock.h" @@ -35,4 +35,4 @@ class MockAudioDecoder : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_audio_vector.h b/modules/audio_coding/neteq/mock/mock_audio_vector.h index 7a4747b0..a5a787c7 100644 --- a/modules/audio_coding/neteq4/mock/mock_audio_vector.h +++ b/modules/audio_coding/neteq/mock/mock_audio_vector.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_ -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include "gmock/gmock.h" @@ -48,4 +48,4 @@ class MockAudioVector : public AudioVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h b/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h index 87265517..d9210668 100644 --- a/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h +++ b/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include "gmock/gmock.h" @@ -34,4 +34,4 @@ class MockBufferLevelFilter : public BufferLevelFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_decoder_database.h b/modules/audio_coding/neteq/mock/mock_decoder_database.h index c4ca25a5..583fa54b 100644 --- a/modules/audio_coding/neteq4/mock/mock_decoder_database.h +++ b/modules/audio_coding/neteq/mock/mock_decoder_database.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "gmock/gmock.h" @@ -61,4 +61,4 @@ class MockDecoderDatabase : public DecoderDatabase { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_delay_manager.h b/modules/audio_coding/neteq/mock/mock_delay_manager.h index 1edfb873..c21a1c28 100644 --- a/modules/audio_coding/neteq4/mock/mock_delay_manager.h +++ b/modules/audio_coding/neteq/mock/mock_delay_manager.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" #include "gmock/gmock.h" @@ -60,4 +60,4 @@ class MockDelayManager : public DelayManager { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h b/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h index 211b2b91..26e09329 100644 --- a/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h +++ b/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "gmock/gmock.h" @@ -31,4 +31,4 @@ class MockDelayPeakDetector : public DelayPeakDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h b/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h index 5a89db46..0351d6b1 100644 --- a/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h +++ b/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" #include "gmock/gmock.h" @@ -35,4 +35,4 @@ class MockDtmfBuffer : public DtmfBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h b/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h index d34f7470..3bed4d15 100644 --- a/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h +++ b/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" #include "gmock/gmock.h" @@ -32,4 +32,4 @@ class MockDtmfToneGenerator : public DtmfToneGenerator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index b13affe1..9522b537 100644 --- a/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h +++ b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "gmock/gmock.h" #include "webrtc/base/constructormagic.h" @@ -96,4 +96,4 @@ class MockExternalPcm16B : public ExternalPcm16B { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_packet_buffer.h b/modules/audio_coding/neteq/mock/mock_packet_buffer.h index b1d8ef90..2882248c 100644 --- a/modules/audio_coding/neteq4/mock/mock_packet_buffer.h +++ b/modules/audio_coding/neteq/mock/mock_packet_buffer.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include "gmock/gmock.h" @@ -55,4 +55,4 @@ class MockPacketBuffer : public PacketBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ diff --git a/modules/audio_coding/neteq4/mock/mock_payload_splitter.h b/modules/audio_coding/neteq/mock/mock_payload_splitter.h index 369dfc43..f1665423 100644 --- a/modules/audio_coding/neteq4/mock/mock_payload_splitter.h +++ b/modules/audio_coding/neteq/mock/mock_payload_splitter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_ -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" #include "gmock/gmock.h" @@ -36,4 +36,4 @@ class MockPayloadSplitter : public PayloadSplitter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_ diff --git a/modules/audio_coding/neteq4/neteq.cc b/modules/audio_coding/neteq/neteq.cc index 48dacea1..7edacde7 100644 --- a/modules/audio_coding/neteq4/neteq.cc +++ b/modules/audio_coding/neteq/neteq.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/neteq.gypi b/modules/audio_coding/neteq/neteq.gypi index 280e5118..ccdc9f5d 100644 --- a/modules/audio_coding/neteq4/neteq.gypi +++ b/modules/audio_coding/neteq/neteq.gypi @@ -33,7 +33,7 @@ }, 'targets': [ { - 'target_name': 'NetEq4', + 'target_name': 'neteq', 'type': 'static_library', 'dependencies': [ '<@(neteq_dependencies)', diff --git a/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index 3352d189..a4010765 100644 --- a/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc +++ b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -15,10 +15,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/modules/audio_coding/neteq4/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc index f8607660..64a86603 100644 --- a/modules/audio_coding/neteq4/neteq_impl.cc +++ b/modules/audio_coding/neteq/neteq_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h" +#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" #include <assert.h> #include <memory.h> // memset @@ -16,28 +16,28 @@ #include <algorithm> #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/merge.h" -#include "webrtc/modules/audio_coding/neteq4/normal.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/merge.h" +#include "webrtc/modules/audio_coding/neteq/normal.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" diff --git a/modules/audio_coding/neteq4/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h index 822a523a..e92babd8 100644 --- a/modules/audio_coding/neteq4/neteq_impl.h +++ b/modules/audio_coding/neteq/neteq_impl.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ #include <vector> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" // Declare PacketList. -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/rtcp.h" -#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" // Declare PacketList. +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/rtcp.h" +#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" @@ -403,4 +403,4 @@ class NetEqImpl : public webrtc::NetEq { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ diff --git a/modules/audio_coding/neteq4/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc index 26279aa9..2e66487f 100644 --- a/modules/audio_coding/neteq4/neteq_impl_unittest.cc +++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" using ::testing::Return; using ::testing::ReturnNull; diff --git a/modules/audio_coding/neteq4/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc index e1d64411..3c695c81 100644 --- a/modules/audio_coding/neteq4/neteq_stereo_unittest.cc +++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -16,9 +16,9 @@ #include "gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/modules/audio_coding/neteq4/neteq_tests.gypi b/modules/audio_coding/neteq/neteq_tests.gypi index 2be47379..4d2ce252 100644 --- a/modules/audio_coding/neteq4/neteq_tests.gypi +++ b/modules/audio_coding/neteq/neteq_tests.gypi @@ -12,8 +12,8 @@ 'target_name': 'neteq_rtpplay', 'type': 'executable', 'dependencies': [ - 'NetEq4', - 'NetEq4TestTools', + 'neteq', + 'neteq_test_tools', 'neteq_unittest_tools', 'PCM16B', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -31,7 +31,7 @@ 'type': 'executable', 'dependencies': [ # TODO(hlundin): Make RTPencode use ACM to encode files. - 'NetEq4TestTools',# Test helpers + 'neteq_test_tools',# Test helpers 'G711', 'G722', 'PCM16B', @@ -99,7 +99,7 @@ 'target_name': 'RTPchange', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ @@ -111,7 +111,7 @@ 'target_name': 'RTPtimeshift', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ @@ -123,7 +123,7 @@ 'target_name': 'RTPcat', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ @@ -135,7 +135,7 @@ 'target_name': 'rtp_to_text', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], 'sources': [ @@ -147,7 +147,7 @@ 'target_name': 'audio_classifier_test', 'type': 'executable', 'dependencies': [ - 'NetEq4', + 'neteq', ], 'sources': [ 'test/audio_classifier_test.cc', @@ -158,7 +158,7 @@ 'target_name': 'neteq_test_support', 'type': 'static_library', 'dependencies': [ - 'NetEq4', + 'neteq', 'PCM16B', 'neteq_unittest_tools', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -173,10 +173,10 @@ }, # neteq_test_support { - 'target_name': 'neteq4_speed_test', + 'target_name': 'neteq_speed_test', 'type': 'executable', 'dependencies': [ - 'NetEq4', + 'neteq', 'neteq_test_support', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -187,10 +187,10 @@ }, { - 'target_name': 'neteq4_opus_fec_quality_test', + 'target_name': 'neteq_opus_fec_quality_test', 'type': 'executable', 'dependencies': [ - 'NetEq4', + 'neteq', 'neteq_test_support', 'webrtc_opus', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -203,7 +203,7 @@ }, { - 'target_name': 'NetEq4TestTools', + 'target_name': 'neteq_test_tools', # Collection of useful functions used in other tests. 'type': 'static_library', 'variables': { diff --git a/modules/audio_coding/neteq4/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index c1a7e165..0233e195 100644 --- a/modules/audio_coding/neteq4/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -12,7 +12,7 @@ * This file includes unit tests for NetEQ. */ -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include <math.h> #include <stdlib.h> @@ -25,7 +25,7 @@ #include "gflags/gflags.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/modules/audio_coding/neteq4/normal.cc b/modules/audio_coding/neteq/normal.cc index 8d9c020f..bfde179b 100644 --- a/modules/audio_coding/neteq4/normal.cc +++ b/modules/audio_coding/neteq/normal.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/normal.h" +#include "webrtc/modules/audio_coding/neteq/normal.h" #include <string.h> // memset, memcpy @@ -16,11 +16,11 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/normal.h b/modules/audio_coding/neteq/normal.h index 1be5c7fd..aa24b528 100644 --- a/modules/audio_coding/neteq4/normal.h +++ b/modules/audio_coding/neteq/normal.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ #include <string.h> // Access to size_t. #include <vector> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -65,4 +65,4 @@ class Normal { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ diff --git a/modules/audio_coding/neteq4/normal_unittest.cc b/modules/audio_coding/neteq/normal_unittest.cc index 2bd7b894..c855865c 100644 --- a/modules/audio_coding/neteq4/normal_unittest.cc +++ b/modules/audio_coding/neteq/normal_unittest.cc @@ -10,16 +10,16 @@ // Unit tests for Normal class. -#include "webrtc/modules/audio_coding/neteq4/normal.h" +#include "webrtc/modules/audio_coding/neteq/normal.h" #include <vector> #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/packet.h b/modules/audio_coding/neteq/packet.h index 4518f913..89ddda78 100644 --- a/modules/audio_coding/neteq4/packet.h +++ b/modules/audio_coding/neteq/packet.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ #include <list> @@ -85,4 +85,4 @@ struct Packet { typedef std::list<Packet*> PacketList; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ diff --git a/modules/audio_coding/neteq4/packet_buffer.cc b/modules/audio_coding/neteq/packet_buffer.cc index da3bdf14..8a81c259 100644 --- a/modules/audio_coding/neteq4/packet_buffer.cc +++ b/modules/audio_coding/neteq/packet_buffer.cc @@ -12,12 +12,12 @@ // an STL list. The list is kept sorted at all times so that the next packet to // decode is at the beginning of the list. -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include <algorithm> // find_if() -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h index 3b068c3a..76c4ddd1 100644 --- a/modules/audio_coding/neteq4/packet_buffer.h +++ b/modules/audio_coding/neteq/packet_buffer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -132,4 +132,4 @@ class PacketBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ diff --git a/modules/audio_coding/neteq4/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc index 387ca146..5e6b89fd 100644 --- a/modules/audio_coding/neteq4/packet_buffer_unittest.cc +++ b/modules/audio_coding/neteq/packet_buffer_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for PacketBuffer class. -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" using ::testing::Return; using ::testing::_; diff --git a/modules/audio_coding/neteq4/payload_splitter.cc b/modules/audio_coding/neteq/payload_splitter.cc index 0e97b7d8..1d61ef0c 100644 --- a/modules/audio_coding/neteq4/payload_splitter.cc +++ b/modules/audio_coding/neteq/payload_splitter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" #include <assert.h> -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/payload_splitter.h b/modules/audio_coding/neteq/payload_splitter.h index 5086409a..a3dd77e5 100644 --- a/modules/audio_coding/neteq4/payload_splitter.h +++ b/modules/audio_coding/neteq/payload_splitter.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" namespace webrtc { @@ -87,4 +87,4 @@ class PayloadSplitter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_ diff --git a/modules/audio_coding/neteq4/payload_splitter_unittest.cc b/modules/audio_coding/neteq/payload_splitter_unittest.cc index c83a9b58..5cde1bda 100644 --- a/modules/audio_coding/neteq4/payload_splitter_unittest.cc +++ b/modules/audio_coding/neteq/payload_splitter_unittest.cc @@ -10,15 +10,15 @@ // Unit tests for PayloadSplitter class. -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" #include <assert.h> #include <utility> // pair #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" using ::testing::Return; diff --git a/modules/audio_coding/neteq4/post_decode_vad.cc b/modules/audio_coding/neteq/post_decode_vad.cc index c3d5c7ed..7ae7f97a 100644 --- a/modules/audio_coding/neteq4/post_decode_vad.cc +++ b/modules/audio_coding/neteq/post_decode_vad.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h index 327de1aa..e713009c 100644 --- a/modules/audio_coding/neteq4/post_decode_vad.h +++ b/modules/audio_coding/neteq/post_decode_vad.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ #include <string> // size_t #include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/common_types.h" // NULL -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -69,4 +69,4 @@ class PostDecodeVad { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ diff --git a/modules/audio_coding/neteq4/post_decode_vad_unittest.cc b/modules/audio_coding/neteq/post_decode_vad_unittest.cc index a4d9da8e..ed48db85 100644 --- a/modules/audio_coding/neteq4/post_decode_vad_unittest.cc +++ b/modules/audio_coding/neteq/post_decode_vad_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for PostDecodeVad class. -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" #include "gtest/gtest.h" diff --git a/modules/audio_coding/neteq4/preemptive_expand.cc b/modules/audio_coding/neteq/preemptive_expand.cc index dace45eb..b2dc3e60 100644 --- a/modules/audio_coding/neteq4/preemptive_expand.cc +++ b/modules/audio_coding/neteq/preemptive_expand.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" #include <algorithm> // min, max diff --git a/modules/audio_coding/neteq4/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h index 4d20ae63..1aa61330 100644 --- a/modules/audio_coding/neteq4/preemptive_expand.h +++ b/modules/audio_coding/neteq/preemptive_expand.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ #include <assert.h> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/time_stretch.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/time_stretch.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -84,4 +84,4 @@ struct PreemptiveExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ diff --git a/modules/audio_coding/neteq4/random_vector.cc b/modules/audio_coding/neteq/random_vector.cc index e7a5a1d1..b12f2171 100644 --- a/modules/audio_coding/neteq4/random_vector.cc +++ b/modules/audio_coding/neteq/random_vector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/random_vector.h b/modules/audio_coding/neteq/random_vector.h index 2c67ebbf..767dc48e 100644 --- a/modules/audio_coding/neteq4/random_vector.h +++ b/modules/audio_coding/neteq/random_vector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ #include <string.h> // size_t @@ -47,4 +47,4 @@ class RandomVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ diff --git a/modules/audio_coding/neteq4/random_vector_unittest.cc b/modules/audio_coding/neteq/random_vector_unittest.cc index 83193e2a..cbdcdf7c 100644 --- a/modules/audio_coding/neteq4/random_vector_unittest.cc +++ b/modules/audio_coding/neteq/random_vector_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for RandomVector class. -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" #include "gtest/gtest.h" diff --git a/modules/audio_coding/neteq4/rtcp.cc b/modules/audio_coding/neteq/rtcp.cc index bc178fc3..cf8e0280 100644 --- a/modules/audio_coding/neteq4/rtcp.cc +++ b/modules/audio_coding/neteq/rtcp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/rtcp.h" +#include "webrtc/modules/audio_coding/neteq/rtcp.h" #include <string.h> diff --git a/modules/audio_coding/neteq4/rtcp.h b/modules/audio_coding/neteq/rtcp.h index d4656678..2a765efa 100644 --- a/modules/audio_coding/neteq4/rtcp.h +++ b/modules/audio_coding/neteq/rtcp.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -55,4 +55,4 @@ class Rtcp { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ diff --git a/modules/audio_coding/neteq4/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc index b6e9222d..383f7055 100644 --- a/modules/audio_coding/neteq4/statistics_calculator.cc +++ b/modules/audio_coding/neteq/statistics_calculator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h" +#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include <assert.h> #include <string.h> // memset -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h index 30f9377a..07ef8536 100644 --- a/modules/audio_coding/neteq4/statistics_calculator.h +++ b/modules/audio_coding/neteq/statistics_calculator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ #include <vector> #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -106,4 +106,4 @@ class StatisticsCalculator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ diff --git a/modules/audio_coding/neteq4/sync_buffer.cc b/modules/audio_coding/neteq/sync_buffer.cc index 75ee6ece..d1802e17 100644 --- a/modules/audio_coding/neteq4/sync_buffer.cc +++ b/modules/audio_coding/neteq/sync_buffer.cc @@ -12,7 +12,7 @@ #include <algorithm> // Access to min. -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h index 8deb9500..59bd4d87 100644 --- a/modules/audio_coding/neteq4/sync_buffer.h +++ b/modules/audio_coding/neteq/sync_buffer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -98,4 +98,4 @@ class SyncBuffer : public AudioMultiVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ diff --git a/modules/audio_coding/neteq4/sync_buffer_unittest.cc b/modules/audio_coding/neteq/sync_buffer_unittest.cc index 1aafa22a..1a3d0fe7 100644 --- a/modules/audio_coding/neteq4/sync_buffer_unittest.cc +++ b/modules/audio_coding/neteq/sync_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "gtest/gtest.h" diff --git a/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc b/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc index e1750912..e1750912 100644 --- a/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc +++ b/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc diff --git a/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h b/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h index 9f09c948..9f09c948 100644 --- a/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h +++ b/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h diff --git a/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc index 22f18efd..22f18efd 100644 --- a/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc +++ b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc diff --git a/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h index 8a31274a..8a31274a 100644 --- a/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h +++ b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h diff --git a/modules/audio_coding/neteq4/test/PayloadTypes.h b/modules/audio_coding/neteq/test/PayloadTypes.h index f6cc3da8..f6cc3da8 100644 --- a/modules/audio_coding/neteq4/test/PayloadTypes.h +++ b/modules/audio_coding/neteq/test/PayloadTypes.h diff --git a/modules/audio_coding/neteq4/test/RTPcat.cc b/modules/audio_coding/neteq/test/RTPcat.cc index 87189cfe..f06b574f 100644 --- a/modules/audio_coding/neteq4/test/RTPcat.cc +++ b/modules/audio_coding/neteq/test/RTPcat.cc @@ -14,7 +14,7 @@ #include <vector> #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 diff --git a/modules/audio_coding/neteq4/test/RTPchange.cc b/modules/audio_coding/neteq/test/RTPchange.cc index 30bee86a..54395c02 100644 --- a/modules/audio_coding/neteq4/test/RTPchange.cc +++ b/modules/audio_coding/neteq/test/RTPchange.cc @@ -13,8 +13,8 @@ #include <algorithm> #include <vector> -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 //#define WEBRTC_DUMMY_RTP diff --git a/modules/audio_coding/neteq4/test/RTPencode.cc b/modules/audio_coding/neteq/test/RTPencode.cc index bc806091..93b366b9 100644 --- a/modules/audio_coding/neteq4/test/RTPencode.cc +++ b/modules/audio_coding/neteq/test/RTPencode.cc @@ -25,8 +25,8 @@ #include "webrtc/typedefs.h" // needed for NetEqDecoder -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" /************************/ /* Define payload types */ diff --git a/modules/audio_coding/neteq4/test/RTPjitter.cc b/modules/audio_coding/neteq/test/RTPjitter.cc index eeb4c901..eeb4c901 100644 --- a/modules/audio_coding/neteq4/test/RTPjitter.cc +++ b/modules/audio_coding/neteq/test/RTPjitter.cc diff --git a/modules/audio_coding/neteq4/test/RTPtimeshift.cc b/modules/audio_coding/neteq/test/RTPtimeshift.cc index 15ffdf6a..15ffdf6a 100644 --- a/modules/audio_coding/neteq4/test/RTPtimeshift.cc +++ b/modules/audio_coding/neteq/test/RTPtimeshift.cc diff --git a/modules/audio_coding/neteq4/test/audio_classifier_test.cc b/modules/audio_coding/neteq/test/audio_classifier_test.cc index 730406bb..aa2b61d0 100644 --- a/modules/audio_coding/neteq4/test/audio_classifier_test.cc +++ b/modules/audio_coding/neteq/test/audio_classifier_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h" +#include "webrtc/modules/audio_coding/neteq/audio_classifier.h" #include <math.h> #include <stdio.h> diff --git a/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m b/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m index 77b394f4..77b394f4 100644 --- a/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m +++ b/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m diff --git a/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m b/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m index bc1c85a2..bc1c85a2 100644 --- a/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m +++ b/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m diff --git a/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc b/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc index aa4522b1..ad6d8ece 100644 --- a/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc @@ -10,7 +10,7 @@ #include <gflags/gflags.h> #include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h" -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" #include "webrtc/test/testsupport/fileutils.h" using google::RegisterFlagValidator; diff --git a/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc index f669742c..14857c77 100644 --- a/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc +++ b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/test/testsupport/perf_test.h" #include "webrtc/typedefs.h" diff --git a/modules/audio_coding/neteq4/test/neteq_speed_test.cc b/modules/audio_coding/neteq/test/neteq_speed_test.cc index cecd48b7..05e75f34 100644 --- a/modules/audio_coding/neteq4/test/neteq_speed_test.cc +++ b/modules/audio_coding/neteq/test/neteq_speed_test.cc @@ -13,7 +13,7 @@ #include <iostream> #include "gflags/gflags.h" -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/typedefs.h" // Flag validators. diff --git a/modules/audio_coding/neteq4/test/rtp_to_text.cc b/modules/audio_coding/neteq/test/rtp_to_text.cc index 1112d79c..1112d79c 100644 --- a/modules/audio_coding/neteq4/test/rtp_to_text.cc +++ b/modules/audio_coding/neteq/test/rtp_to_text.cc diff --git a/modules/audio_coding/neteq4/time_stretch.cc b/modules/audio_coding/neteq/time_stretch.cc index 5b246c11..a9228d49 100644 --- a/modules/audio_coding/neteq4/time_stretch.cc +++ b/modules/audio_coding/neteq/time_stretch.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/time_stretch.h" +#include "webrtc/modules/audio_coding/neteq/time_stretch.h" #include <algorithm> // min, max #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/time_stretch.h b/modules/audio_coding/neteq/time_stretch.h index cd110b12..9396d8ff 100644 --- a/modules/audio_coding/neteq4/time_stretch.h +++ b/modules/audio_coding/neteq/time_stretch.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ #include <assert.h> #include <string.h> // memset, size_t #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -108,4 +108,4 @@ class TimeStretch { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ diff --git a/modules/audio_coding/neteq4/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc index 529038ac..64789b4d 100644 --- a/modules/audio_coding/neteq4/time_stretch_unittest.cc +++ b/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -10,11 +10,11 @@ // Unit tests for Accelerate and PreemptiveExpand classes. -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/timestamp_scaler.cc b/modules/audio_coding/neteq/timestamp_scaler.cc index b2b5b40a..01890136 100644 --- a/modules/audio_coding/neteq4/timestamp_scaler.cc +++ b/modules/audio_coding/neteq/timestamp_scaler.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/timestamp_scaler.h b/modules/audio_coding/neteq/timestamp_scaler.h index 604b5999..59b8cc7d 100644 --- a/modules/audio_coding/neteq4/timestamp_scaler.h +++ b/modules/audio_coding/neteq/timestamp_scaler.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -65,4 +65,4 @@ class TimestampScaler { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ diff --git a/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc index c6760946..8cbbfa39 100644 --- a/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc +++ b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" using ::testing::Return; using ::testing::ReturnNull; diff --git a/modules/audio_coding/neteq4/tools/audio_loop.cc b/modules/audio_coding/neteq/tools/audio_loop.cc index 94ea5bef..2d2a7e3d 100644 --- a/modules/audio_coding/neteq4/tools/audio_loop.cc +++ b/modules/audio_coding/neteq/tools/audio_loop.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h" +#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include <assert.h> #include <stdio.h> diff --git a/modules/audio_coding/neteq4/tools/audio_loop.h b/modules/audio_coding/neteq/tools/audio_loop.h index 144898eb..9647d827 100644 --- a/modules/audio_coding/neteq4/tools/audio_loop.h +++ b/modules/audio_coding/neteq/tools/audio_loop.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ #include <string> @@ -56,4 +56,4 @@ class AudioLoop { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ diff --git a/modules/audio_coding/neteq4/tools/input_audio_file.cc b/modules/audio_coding/neteq/tools/input_audio_file.cc index 62692e27..80631732 100644 --- a/modules/audio_coding/neteq4/tools/input_audio_file.cc +++ b/modules/audio_coding/neteq/tools/input_audio_file.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq4/tools/input_audio_file.h b/modules/audio_coding/neteq/tools/input_audio_file.h index 7325d046..274f8ea0 100644 --- a/modules/audio_coding/neteq4/tools/input_audio_file.h +++ b/modules/audio_coding/neteq/tools/input_audio_file.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ #include <stdio.h> @@ -48,4 +48,4 @@ class InputAudioFile { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ diff --git a/modules/audio_coding/neteq4/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc index 2eb74628..433546fb 100644 --- a/modules/audio_coding/neteq4/tools/neteq_performance_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/modules/audio_coding/neteq4/tools/neteq_performance_test.h b/modules/audio_coding/neteq/tools/neteq_performance_test.h index 1b205c03..d094db0f 100644 --- a/modules/audio_coding/neteq4/tools/neteq_performance_test.h +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ #include "webrtc/typedefs.h" @@ -29,4 +29,4 @@ class NetEqPerformanceTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ diff --git a/modules/audio_coding/neteq4/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc index 8daca18f..fc5d8aba 100644 --- a/modules/audio_coding/neteq4/tools/neteq_quality_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.cc @@ -9,7 +9,7 @@ */ #include <stdio.h> -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq4/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h index 03aabc88..87fc5079 100644 --- a/modules/audio_coding/neteq4/tools/neteq_quality_test.h +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ #include <string> #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -97,4 +97,4 @@ class NetEqQualityTest : public ::testing::Test { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ diff --git a/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index 1308bf5d..3c5f6b0b 100644 --- a/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc +++ b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -20,10 +20,10 @@ #include "google/gflags.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/modules/audio_coding/neteq4/tools/packet.cc b/modules/audio_coding/neteq/tools/packet.cc index 6e0778b3..d8fb7134 100644 --- a/modules/audio_coding/neteq4/tools/packet.cc +++ b/modules/audio_coding/neteq/tools/packet.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/tools/packet.h b/modules/audio_coding/neteq/tools/packet.h index 03586bc0..eb8ce28a 100644 --- a/modules/audio_coding/neteq4/tools/packet.h +++ b/modules/audio_coding/neteq/tools/packet.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ #include <list> @@ -114,4 +114,4 @@ class Packet { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ diff --git a/modules/audio_coding/neteq4/tools/packet_source.h b/modules/audio_coding/neteq/tools/packet_source.h index 261ae788..c539b8e8 100644 --- a/modules/audio_coding/neteq4/tools/packet_source.h +++ b/modules/audio_coding/neteq/tools/packet_source.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ #include "webrtc/base/constructormagic.h" @@ -33,4 +33,4 @@ class PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ diff --git a/modules/audio_coding/neteq4/tools/packet_unittest.cc b/modules/audio_coding/neteq/tools/packet_unittest.cc index b6c0713d..df844ee8 100644 --- a/modules/audio_coding/neteq4/tools/packet_unittest.cc +++ b/modules/audio_coding/neteq/tools/packet_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for test Packet class. -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "gtest/gtest.h" diff --git a/modules/audio_coding/neteq4/tools/rtp_analyze.cc b/modules/audio_coding/neteq/tools/rtp_analyze.cc index 71a6c3c6..773cc2c8 100644 --- a/modules/audio_coding/neteq4/tools/rtp_analyze.cc +++ b/modules/audio_coding/neteq/tools/rtp_analyze.cc @@ -13,8 +13,8 @@ #include <vector> #include "google/gflags.h" -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" // Flag validator. diff --git a/modules/audio_coding/neteq4/tools/rtp_file_source.cc b/modules/audio_coding/neteq/tools/rtp_file_source.cc index ceedde01..82786353 100644 --- a/modules/audio_coding/neteq4/tools/rtp_file_source.cc +++ b/modules/audio_coding/neteq/tools/rtp_file_source.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include <assert.h> #include <string.h> @@ -18,7 +18,7 @@ #include <netinet/in.h> #endif -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/tools/rtp_file_source.h b/modules/audio_coding/neteq/tools/rtp_file_source.h index 86197d91..527018e1 100644 --- a/modules/audio_coding/neteq4/tools/rtp_file_source.h +++ b/modules/audio_coding/neteq/tools/rtp_file_source.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ #include <stdio.h> #include <string> #include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq4/tools/packet_source.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" @@ -63,4 +63,4 @@ class RtpFileSource : public PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ diff --git a/modules/audio_coding/neteq4/tools/rtp_generator.cc b/modules/audio_coding/neteq/tools/rtp_generator.cc index 8d9a89d5..17ac209f 100644 --- a/modules/audio_coding/neteq4/tools/rtp_generator.cc +++ b/modules/audio_coding/neteq/tools/rtp_generator.cc @@ -10,7 +10,7 @@ #include <assert.h> -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq4/tools/rtp_generator.h b/modules/audio_coding/neteq/tools/rtp_generator.h index e1fe8027..d3824c8d 100644 --- a/modules/audio_coding/neteq4/tools/rtp_generator.h +++ b/modules/audio_coding/neteq/tools/rtp_generator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ #include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" @@ -54,4 +54,4 @@ class RtpGenerator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ diff --git a/modules/audio_coding_module.target.darwin-arm.mk b/modules/audio_coding_module.target.darwin-arm.mk index c3d24ca3..1d5316fb 100644 --- a/modules/audio_coding_module.target.darwin-arm.mk +++ b/modules/audio_coding_module.target.darwin-arm.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -153,6 +154,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -248,6 +250,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -289,6 +292,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.darwin-arm64.mk b/modules/audio_coding_module.target.darwin-arm64.mk index 341965c8..fcf927b6 100644 --- a/modules/audio_coding_module.target.darwin-arm64.mk +++ b/modules/audio_coding_module.target.darwin-arm64.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -140,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +226,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -262,6 +265,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.darwin-mips.mk b/modules/audio_coding_module.target.darwin-mips.mk index 6ab114bf..c8611528 100644 --- a/modules/audio_coding_module.target.darwin-mips.mk +++ b/modules/audio_coding_module.target.darwin-mips.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -148,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -239,6 +241,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -279,6 +282,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.darwin-x86.mk b/modules/audio_coding_module.target.darwin-x86.mk index a6fa3ca1..4f2b1ebe 100644 --- a/modules/audio_coding_module.target.darwin-x86.mk +++ b/modules/audio_coding_module.target.darwin-x86.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -234,6 +236,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -272,6 +275,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.darwin-x86_64.mk b/modules/audio_coding_module.target.darwin-x86_64.mk index f38aefea..9abccc26 100644 --- a/modules/audio_coding_module.target.darwin-x86_64.mk +++ b/modules/audio_coding_module.target.darwin-x86_64.mk @@ -107,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -232,6 +234,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -270,6 +273,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.linux-arm.mk b/modules/audio_coding_module.target.linux-arm.mk index c3d24ca3..1d5316fb 100644 --- a/modules/audio_coding_module.target.linux-arm.mk +++ b/modules/audio_coding_module.target.linux-arm.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -153,6 +154,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -248,6 +250,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -289,6 +292,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.linux-arm64.mk b/modules/audio_coding_module.target.linux-arm64.mk index 341965c8..fcf927b6 100644 --- a/modules/audio_coding_module.target.linux-arm64.mk +++ b/modules/audio_coding_module.target.linux-arm64.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -140,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +226,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -262,6 +265,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.linux-mips.mk b/modules/audio_coding_module.target.linux-mips.mk index 6ab114bf..c8611528 100644 --- a/modules/audio_coding_module.target.linux-mips.mk +++ b/modules/audio_coding_module.target.linux-mips.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -148,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -239,6 +241,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -279,6 +282,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.linux-x86.mk b/modules/audio_coding_module.target.linux-x86.mk index a6fa3ca1..4f2b1ebe 100644 --- a/modules/audio_coding_module.target.linux-x86.mk +++ b/modules/audio_coding_module.target.linux-x86.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -234,6 +236,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -272,6 +275,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_coding_module.target.linux-x86_64.mk b/modules/audio_coding_module.target.linux-x86_64.mk index f38aefea..9abccc26 100644 --- a/modules/audio_coding_module.target.linux-x86_64.mk +++ b/modules/audio_coding_module.target.linux-x86_64.mk @@ -107,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -232,6 +234,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -270,6 +273,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.darwin-arm.mk b/modules/audio_conference_mixer.target.darwin-arm.mk index a9818e9b..1c81635c 100644 --- a/modules/audio_conference_mixer.target.darwin-arm.mk +++ b/modules/audio_conference_mixer.target.darwin-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -128,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.darwin-arm64.mk b/modules/audio_conference_mixer.target.darwin-arm64.mk index 22209dde..52a59fad 100644 --- a/modules/audio_conference_mixer.target.darwin-arm64.mk +++ b/modules/audio_conference_mixer.target.darwin-arm64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -185,6 +187,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.darwin-mips.mk b/modules/audio_conference_mixer.target.darwin-mips.mk index f99be436..68f2c3c7 100644 --- a/modules/audio_conference_mixer.target.darwin-mips.mk +++ b/modules/audio_conference_mixer.target.darwin-mips.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -200,6 +202,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -239,6 +242,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.darwin-x86.mk b/modules/audio_conference_mixer.target.darwin-x86.mk index ed702a48..819b6d74 100644 --- a/modules/audio_conference_mixer.target.darwin-x86.mk +++ b/modules/audio_conference_mixer.target.darwin-x86.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -232,6 +235,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.darwin-x86_64.mk b/modules/audio_conference_mixer.target.darwin-x86_64.mk index bdb3c1aa..d3ce5408 100644 --- a/modules/audio_conference_mixer.target.darwin-x86_64.mk +++ b/modules/audio_conference_mixer.target.darwin-x86_64.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -193,6 +195,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -230,6 +233,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.linux-arm.mk b/modules/audio_conference_mixer.target.linux-arm.mk index a9818e9b..1c81635c 100644 --- a/modules/audio_conference_mixer.target.linux-arm.mk +++ b/modules/audio_conference_mixer.target.linux-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -128,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.linux-arm64.mk b/modules/audio_conference_mixer.target.linux-arm64.mk index 22209dde..52a59fad 100644 --- a/modules/audio_conference_mixer.target.linux-arm64.mk +++ b/modules/audio_conference_mixer.target.linux-arm64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -185,6 +187,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.linux-mips.mk b/modules/audio_conference_mixer.target.linux-mips.mk index f99be436..68f2c3c7 100644 --- a/modules/audio_conference_mixer.target.linux-mips.mk +++ b/modules/audio_conference_mixer.target.linux-mips.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -200,6 +202,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -239,6 +242,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.linux-x86.mk b/modules/audio_conference_mixer.target.linux-x86.mk index ed702a48..819b6d74 100644 --- a/modules/audio_conference_mixer.target.linux-x86.mk +++ b/modules/audio_conference_mixer.target.linux-x86.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -232,6 +235,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_conference_mixer.target.linux-x86_64.mk b/modules/audio_conference_mixer.target.linux-x86_64.mk index bdb3c1aa..d3ce5408 100644 --- a/modules/audio_conference_mixer.target.linux-x86_64.mk +++ b/modules/audio_conference_mixer.target.linux-x86_64.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -193,6 +195,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -230,6 +233,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.darwin-arm.mk b/modules/audio_device.target.darwin-arm.mk index 220ff854..afce6faa 100644 --- a/modules/audio_device.target.darwin-arm.mk +++ b/modules/audio_device.target.darwin-arm.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -91,6 +92,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -131,6 +133,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -259,6 +263,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.darwin-arm64.mk b/modules/audio_device.target.darwin-arm64.mk index 2927324e..11c79ae5 100644 --- a/modules/audio_device.target.darwin-arm64.mk +++ b/modules/audio_device.target.darwin-arm64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -81,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -232,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.darwin-mips.mk b/modules/audio_device.target.darwin-mips.mk index c8b8a06b..fcd225ad 100644 --- a/modules/audio_device.target.darwin-mips.mk +++ b/modules/audio_device.target.darwin-mips.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -87,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +212,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.darwin-x86.mk b/modules/audio_device.target.darwin-x86.mk index 7ac50c78..ca2ec6f0 100644 --- a/modules/audio_device.target.darwin-x86.mk +++ b/modules/audio_device.target.darwin-x86.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -86,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -242,6 +246,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.darwin-x86_64.mk b/modules/audio_device.target.darwin-x86_64.mk index a91eb89d..04c576b5 100644 --- a/modules/audio_device.target.darwin-x86_64.mk +++ b/modules/audio_device.target.darwin-x86_64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -85,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -122,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -202,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -240,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.linux-arm.mk b/modules/audio_device.target.linux-arm.mk index 220ff854..afce6faa 100644 --- a/modules/audio_device.target.linux-arm.mk +++ b/modules/audio_device.target.linux-arm.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -91,6 +92,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -131,6 +133,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -259,6 +263,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.linux-arm64.mk b/modules/audio_device.target.linux-arm64.mk index 2927324e..11c79ae5 100644 --- a/modules/audio_device.target.linux-arm64.mk +++ b/modules/audio_device.target.linux-arm64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -81,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -232,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.linux-mips.mk b/modules/audio_device.target.linux-mips.mk index c8b8a06b..fcd225ad 100644 --- a/modules/audio_device.target.linux-mips.mk +++ b/modules/audio_device.target.linux-mips.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -87,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +212,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.linux-x86.mk b/modules/audio_device.target.linux-x86.mk index 7ac50c78..ca2ec6f0 100644 --- a/modules/audio_device.target.linux-x86.mk +++ b/modules/audio_device.target.linux-x86.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -86,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -242,6 +246,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device.target.linux-x86_64.mk b/modules/audio_device.target.linux-x86_64.mk index a91eb89d..04c576b5 100644 --- a/modules/audio_device.target.linux-x86_64.mk +++ b/modules/audio_device.target.linux-x86_64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_device/audio_device_utility.cc \ third_party/webrtc/modules/audio_device/audio_device_impl.cc \ third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \ - third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc + third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \ + third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc # Flags passed to both C and C++ files. @@ -85,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -122,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -202,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -240,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_device/Android.mk b/modules/audio_device/Android.mk index affa5e1c..4b3b9124 100644 --- a/modules/audio_device/Android.mk +++ b/modules/audio_device/Android.mk @@ -25,7 +25,8 @@ LOCAL_SRC_FILES := \ android/audio_device_android_opensles.cc \ android/audio_device_utility_android.cc \ dummy/audio_device_utility_dummy.cc \ - dummy/audio_device_dummy.cc + dummy/audio_device_dummy.cc \ + dummy/file_audio_device.cc # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ diff --git a/modules/audio_device/OWNERS b/modules/audio_device/OWNERS index e533e855..7bb3cd52 100644 --- a/modules/audio_device/OWNERS +++ b/modules/audio_device/OWNERS @@ -3,6 +3,8 @@ henrika@webrtc.org niklas.enbom@webrtc.org xians@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/modules/audio_device/audio_device.gypi b/modules/audio_device/audio_device.gypi index 944f4222..a64856b5 100644 --- a/modules/audio_device/audio_device.gypi +++ b/modules/audio_device/audio_device.gypi @@ -20,7 +20,7 @@ '.', '../interface', 'include', - 'dummy', # dummy audio device + 'dummy', # Contains dummy audio device implementations. ], 'direct_dependent_settings': { 'include_dirs': [ @@ -45,6 +45,8 @@ 'dummy/audio_device_dummy.h', 'dummy/audio_device_utility_dummy.cc', 'dummy/audio_device_utility_dummy.h', + 'dummy/file_audio_device.cc', + 'dummy/file_audio_device.h', ], 'conditions': [ ['OS=="linux"', { @@ -77,6 +79,13 @@ 'WEBRTC_DUMMY_AUDIO_BUILD', ], }], + ['build_with_chromium==0', { + 'sources': [ + # Don't link these into Chrome since they contain static data. + 'dummy/file_audio_device_factory.cc', + 'dummy/file_audio_device_factory.h', + ], + }], ['include_internal_audio_device==1', { 'sources': [ 'linux/alsasymboltable_linux.cc', diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index a2e5cba7..58411e3b 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -45,8 +45,14 @@ #include "audio_device_utility_mac.h" #include "audio_device_mac.h" #endif + +#if defined(WEBRTC_DUMMY_FILE_DEVICES) +#include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h" +#endif + #include "webrtc/modules/audio_device/dummy/audio_device_dummy.h" #include "webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h" +#include "webrtc/modules/audio_device/dummy/file_audio_device.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" @@ -203,6 +209,14 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() { ptrAudioDeviceUtility = new AudioDeviceUtilityDummy(Id()); } +#elif defined(WEBRTC_DUMMY_FILE_DEVICES) + ptrAudioDevice = FileAudioDeviceFactory::CreateFileAudioDevice(Id()); + WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, + "Will use file-playing dummy device."); + if (ptrAudioDevice != NULL) + { + ptrAudioDeviceUtility = new AudioDeviceUtilityDummy(Id()); + } #else const AudioLayer audioLayer(PlatformAudioLayer()); diff --git a/modules/audio_device/audio_device_tests.isolate b/modules/audio_device/audio_device_tests.isolate index 69e877c1..ebe8bfb4 100644 --- a/modules/audio_device/audio_device_tests.isolate +++ b/modules/audio_device/audio_device_tests.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../../data/', - '../../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc new file mode 100644 index 00000000..e7771c66 --- /dev/null +++ b/modules/audio_device/dummy/file_audio_device.cc @@ -0,0 +1,586 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +#include <iostream> +#include "webrtc/modules/audio_device/dummy/file_audio_device.h" +#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" + +namespace webrtc { + +int kRecordingFixedSampleRate = 48000; +int kRecordingNumChannels = 2; +int kPlayoutFixedSampleRate = 48000; +int kPlayoutNumChannels = 2; +int kPlayoutBufferSize = kPlayoutFixedSampleRate / 100 + * kPlayoutNumChannels * 2; +int kRecordingBufferSize = kRecordingFixedSampleRate / 100 + * kRecordingNumChannels * 2; + +FileAudioDevice::FileAudioDevice(const int32_t id, + const char* inputFilename, + const char* outputFile): + _ptrAudioBuffer(NULL), + _recordingBuffer(NULL), + _playoutBuffer(NULL), + _recordingFramesLeft(0), + _playoutFramesLeft(0), + _critSect(*CriticalSectionWrapper::CreateCriticalSection()), + _recordingBufferSizeIn10MS(0), + _recordingFramesIn10MS(0), + _playoutFramesIn10MS(0), + _ptrThreadRec(NULL), + _ptrThreadPlay(NULL), + _recThreadID(0), + _playThreadID(0), + _playing(false), + _recording(false), + _lastCallPlayoutMillis(0), + _lastCallRecordMillis(0), + _outputFile(*FileWrapper::Create()), + _inputFile(*FileWrapper::Create()), + _outputFilename(outputFile), + _inputFilename(inputFilename), + _clock(Clock::GetRealTimeClock()) { +} + +FileAudioDevice::~FileAudioDevice() { + _outputFile.Flush(); + _outputFile.CloseFile(); + delete &_outputFile; + _inputFile.Flush(); + _inputFile.CloseFile(); + delete &_inputFile; +} + +int32_t FileAudioDevice::ActiveAudioLayer( + AudioDeviceModule::AudioLayer& audioLayer) const { + return -1; +} + +int32_t FileAudioDevice::Init() { return 0; } + +int32_t FileAudioDevice::Terminate() { return 0; } + +bool FileAudioDevice::Initialized() const { return true; } + +int16_t FileAudioDevice::PlayoutDevices() { + return 1; +} + +int16_t FileAudioDevice::RecordingDevices() { + return 1; +} + +int32_t FileAudioDevice::PlayoutDeviceName(uint16_t index, + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) { + const char* kName = "dummy_device"; + const char* kGuid = "dummy_device_unique_id"; + if (index < 1) { + memset(name, 0, kAdmMaxDeviceNameSize); + memset(guid, 0, kAdmMaxGuidSize); + memcpy(name, kName, strlen(kName)); + memcpy(guid, kGuid, strlen(guid)); + return 0; + } + return -1; +} + +int32_t FileAudioDevice::RecordingDeviceName(uint16_t index, + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) { + const char* kName = "dummy_device"; + const char* kGuid = "dummy_device_unique_id"; + if (index < 1) { + memset(name, 0, kAdmMaxDeviceNameSize); + memset(guid, 0, kAdmMaxGuidSize); + memcpy(name, kName, strlen(kName)); + memcpy(guid, kGuid, strlen(guid)); + return 0; + } + return -1; +} + +int32_t FileAudioDevice::SetPlayoutDevice(uint16_t index) { + if (index == 0) { + _playout_index = index; + return 0; + } + return -1; +} + +int32_t FileAudioDevice::SetPlayoutDevice( + AudioDeviceModule::WindowsDeviceType device) { + return -1; +} + +int32_t FileAudioDevice::SetRecordingDevice(uint16_t index) { + if (index == 0) { + _record_index = index; + return _record_index; + } + return -1; +} + +int32_t FileAudioDevice::SetRecordingDevice( + AudioDeviceModule::WindowsDeviceType device) { + return -1; +} + +int32_t FileAudioDevice::PlayoutIsAvailable(bool& available) { + if (_playout_index == 0) { + available = true; + return _playout_index; + } + available = false; + return -1; +} + +int32_t FileAudioDevice::InitPlayout() { + if (_ptrAudioBuffer) + { + // Update webrtc audio buffer with the selected parameters + _ptrAudioBuffer->SetPlayoutSampleRate(kPlayoutFixedSampleRate); + _ptrAudioBuffer->SetPlayoutChannels(kPlayoutNumChannels); + } + return 0; +} + +bool FileAudioDevice::PlayoutIsInitialized() const { + return true; +} + +int32_t FileAudioDevice::RecordingIsAvailable(bool& available) { + if (_record_index == 0) { + available = true; + return _record_index; + } + available = false; + return -1; +} + +int32_t FileAudioDevice::InitRecording() { + CriticalSectionScoped lock(&_critSect); + + if (_recording) { + return -1; + } + + _recordingFramesIn10MS = kRecordingFixedSampleRate/100; + + if (_ptrAudioBuffer) { + _ptrAudioBuffer->SetRecordingSampleRate(kRecordingFixedSampleRate); + _ptrAudioBuffer->SetRecordingChannels(kRecordingNumChannels); + } + return 0; +} + +bool FileAudioDevice::RecordingIsInitialized() const { + return true; +} + +int32_t FileAudioDevice::StartPlayout() { + if (_playing) + { + return 0; + } + + _playing = true; + _playoutFramesLeft = 0; + + if (!_playoutBuffer) + _playoutBuffer = new int8_t[2 * + kPlayoutNumChannels * + kPlayoutFixedSampleRate/100]; + if (!_playoutBuffer) + { + _playing = false; + return -1; + } + + // PLAYOUT + const char* threadName = "webrtc_audio_module_play_thread"; + _ptrThreadPlay = ThreadWrapper::CreateThread(PlayThreadFunc, + this, + kRealtimePriority, + threadName); + if (_ptrThreadPlay == NULL) + { + _playing = false; + delete [] _playoutBuffer; + _playoutBuffer = NULL; + return -1; + } + + if (_outputFile.OpenFile(_outputFilename.c_str(), + false, false, false) == -1) { + printf("Failed to open playout file %s!", _outputFilename.c_str()); + _playing = false; + delete [] _playoutBuffer; + _playoutBuffer = NULL; + return -1; + } + + unsigned int threadID(0); + if (!_ptrThreadPlay->Start(threadID)) + { + _playing = false; + delete _ptrThreadPlay; + _ptrThreadPlay = NULL; + delete [] _playoutBuffer; + _playoutBuffer = NULL; + return -1; + } + _playThreadID = threadID; + + return 0; +} + +int32_t FileAudioDevice::StopPlayout() { + { + CriticalSectionScoped lock(&_critSect); + _playing = false; + } + + // stop playout thread first + if (_ptrThreadPlay && !_ptrThreadPlay->Stop()) + { + return -1; + } + else { + delete _ptrThreadPlay; + _ptrThreadPlay = NULL; + } + + CriticalSectionScoped lock(&_critSect); + + _playoutFramesLeft = 0; + delete [] _playoutBuffer; + _playoutBuffer = NULL; + _outputFile.Flush(); + _outputFile.CloseFile(); + return 0; +} + +bool FileAudioDevice::Playing() const { + return true; +} + +int32_t FileAudioDevice::StartRecording() { + _recording = true; + + // Make sure we only create the buffer once. + _recordingBufferSizeIn10MS = _recordingFramesIn10MS * + kRecordingNumChannels * + 2; + if (!_recordingBuffer) { + _recordingBuffer = new int8_t[_recordingBufferSizeIn10MS]; + } + + if (_inputFile.OpenFile(_inputFilename.c_str(), true, + true, false) == -1) { + printf("Failed to open audio input file %s!\n", + _inputFilename.c_str()); + _recording = false; + delete[] _recordingBuffer; + _recordingBuffer = NULL; + return -1; + } + + const char* threadName = "webrtc_audio_module_capture_thread"; + _ptrThreadRec = ThreadWrapper::CreateThread(RecThreadFunc, + this, + kRealtimePriority, + threadName); + if (_ptrThreadRec == NULL) + { + _recording = false; + delete [] _recordingBuffer; + _recordingBuffer = NULL; + return -1; + } + + unsigned int threadID(0); + if (!_ptrThreadRec->Start(threadID)) + { + _recording = false; + delete _ptrThreadRec; + _ptrThreadRec = NULL; + delete [] _recordingBuffer; + _recordingBuffer = NULL; + return -1; + } + _recThreadID = threadID; + + return 0; +} + + +int32_t FileAudioDevice::StopRecording() { + { + CriticalSectionScoped lock(&_critSect); + _recording = false; + } + + if (_ptrThreadRec && !_ptrThreadRec->Stop()) + { + return -1; + } + else { + delete _ptrThreadRec; + _ptrThreadRec = NULL; + } + + CriticalSectionScoped lock(&_critSect); + _recordingFramesLeft = 0; + if (_recordingBuffer) + { + delete [] _recordingBuffer; + _recordingBuffer = NULL; + } + return 0; +} + +bool FileAudioDevice::Recording() const { + return _recording; +} + +int32_t FileAudioDevice::SetAGC(bool enable) { return -1; } + +bool FileAudioDevice::AGC() const { return false; } + +int32_t FileAudioDevice::SetWaveOutVolume(uint16_t volumeLeft, + uint16_t volumeRight) { + return -1; +} + +int32_t FileAudioDevice::WaveOutVolume(uint16_t& volumeLeft, + uint16_t& volumeRight) const { + return -1; +} + +int32_t FileAudioDevice::InitSpeaker() { return -1; } + +bool FileAudioDevice::SpeakerIsInitialized() const { return false; } + +int32_t FileAudioDevice::InitMicrophone() { return 0; } + +bool FileAudioDevice::MicrophoneIsInitialized() const { return true; } + +int32_t FileAudioDevice::SpeakerVolumeIsAvailable(bool& available) { + return -1; +} + +int32_t FileAudioDevice::SetSpeakerVolume(uint32_t volume) { return -1; } + +int32_t FileAudioDevice::SpeakerVolume(uint32_t& volume) const { return -1; } + +int32_t FileAudioDevice::MaxSpeakerVolume(uint32_t& maxVolume) const { + return -1; +} + +int32_t FileAudioDevice::MinSpeakerVolume(uint32_t& minVolume) const { + return -1; +} + +int32_t FileAudioDevice::SpeakerVolumeStepSize(uint16_t& stepSize) const { + return -1; +} + +int32_t FileAudioDevice::MicrophoneVolumeIsAvailable(bool& available) { + return -1; +} + +int32_t FileAudioDevice::SetMicrophoneVolume(uint32_t volume) { return -1; } + +int32_t FileAudioDevice::MicrophoneVolume(uint32_t& volume) const { + return -1; +} + +int32_t FileAudioDevice::MaxMicrophoneVolume(uint32_t& maxVolume) const { + return -1; +} + +int32_t FileAudioDevice::MinMicrophoneVolume(uint32_t& minVolume) const { + return -1; +} + +int32_t FileAudioDevice::MicrophoneVolumeStepSize(uint16_t& stepSize) const { + return -1; +} + +int32_t FileAudioDevice::SpeakerMuteIsAvailable(bool& available) { return -1; } + +int32_t FileAudioDevice::SetSpeakerMute(bool enable) { return -1; } + +int32_t FileAudioDevice::SpeakerMute(bool& enabled) const { return -1; } + +int32_t FileAudioDevice::MicrophoneMuteIsAvailable(bool& available) { + return -1; +} + +int32_t FileAudioDevice::SetMicrophoneMute(bool enable) { return -1; } + +int32_t FileAudioDevice::MicrophoneMute(bool& enabled) const { return -1; } + +int32_t FileAudioDevice::MicrophoneBoostIsAvailable(bool& available) { + return -1; +} + +int32_t FileAudioDevice::SetMicrophoneBoost(bool enable) { return -1; } + +int32_t FileAudioDevice::MicrophoneBoost(bool& enabled) const { return -1; } + +int32_t FileAudioDevice::StereoPlayoutIsAvailable(bool& available) { + available = true; + return 0; +} +int32_t FileAudioDevice::SetStereoPlayout(bool enable) { + return 0; +} + +int32_t FileAudioDevice::StereoPlayout(bool& enabled) const { + enabled = true; + return 0; +} + +int32_t FileAudioDevice::StereoRecordingIsAvailable(bool& available) { + available = true; + return 0; +} + +int32_t FileAudioDevice::SetStereoRecording(bool enable) { + return 0; +} + +int32_t FileAudioDevice::StereoRecording(bool& enabled) const { + enabled = true; + return 0; +} + +int32_t FileAudioDevice::SetPlayoutBuffer( + const AudioDeviceModule::BufferType type, + uint16_t sizeMS) { + return 0; +} + +int32_t FileAudioDevice::PlayoutBuffer(AudioDeviceModule::BufferType& type, + uint16_t& sizeMS) const { + type = _playBufType; + return 0; +} + +int32_t FileAudioDevice::PlayoutDelay(uint16_t& delayMS) const { + return 0; +} + +int32_t FileAudioDevice::RecordingDelay(uint16_t& delayMS) const { return -1; } + +int32_t FileAudioDevice::CPULoad(uint16_t& load) const { return -1; } + +bool FileAudioDevice::PlayoutWarning() const { return false; } + +bool FileAudioDevice::PlayoutError() const { return false; } + +bool FileAudioDevice::RecordingWarning() const { return false; } + +bool FileAudioDevice::RecordingError() const { return false; } + +void FileAudioDevice::ClearPlayoutWarning() {} + +void FileAudioDevice::ClearPlayoutError() {} + +void FileAudioDevice::ClearRecordingWarning() {} + +void FileAudioDevice::ClearRecordingError() {} + +void FileAudioDevice::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { + CriticalSectionScoped lock(&_critSect); + + _ptrAudioBuffer = audioBuffer; + + // Inform the AudioBuffer about default settings for this implementation. + // Set all values to zero here since the actual settings will be done by + // InitPlayout and InitRecording later. + _ptrAudioBuffer->SetRecordingSampleRate(0); + _ptrAudioBuffer->SetPlayoutSampleRate(0); + _ptrAudioBuffer->SetRecordingChannels(0); + _ptrAudioBuffer->SetPlayoutChannels(0); +} + +bool FileAudioDevice::PlayThreadFunc(void* pThis) +{ + return (static_cast<FileAudioDevice*>(pThis)->PlayThreadProcess()); +} + +bool FileAudioDevice::RecThreadFunc(void* pThis) +{ + return (static_cast<FileAudioDevice*>(pThis)->RecThreadProcess()); +} + +bool FileAudioDevice::PlayThreadProcess() +{ + if(!_playing) + return false; + + uint64_t currentTime = _clock->CurrentNtpInMilliseconds(); + _critSect.Enter(); + + if (_lastCallPlayoutMillis == 0 || + currentTime - _lastCallPlayoutMillis >= 10) + { + _critSect.Leave(); + _ptrAudioBuffer->RequestPlayoutData(_playoutFramesIn10MS); + _critSect.Enter(); + + _playoutFramesLeft = _ptrAudioBuffer->GetPlayoutData(_playoutBuffer); + assert(_playoutFramesLeft == _playoutFramesIn10MS); + if (_outputFile.Open()) { + _outputFile.Write(_playoutBuffer, kPlayoutBufferSize); + _outputFile.Flush(); + } + _lastCallPlayoutMillis = currentTime; + } + _playoutFramesLeft = 0; + _critSect.Leave(); + SleepMs(10 - (_clock->CurrentNtpInMilliseconds() - currentTime)); + return true; +} + +bool FileAudioDevice::RecThreadProcess() +{ + if (!_recording) + return false; + + uint64_t currentTime = _clock->CurrentNtpInMilliseconds(); + _critSect.Enter(); + + if (_lastCallRecordMillis == 0 || + currentTime - _lastCallRecordMillis >= 10) { + if (_inputFile.Open()) { + if (_inputFile.Read(_recordingBuffer, kRecordingBufferSize) > 0) { + _ptrAudioBuffer->SetRecordedBuffer(_recordingBuffer, + _recordingFramesIn10MS); + } else { + _inputFile.Rewind(); + } + _lastCallRecordMillis = currentTime; + _critSect.Leave(); + _ptrAudioBuffer->DeliverRecordedData(); + _critSect.Enter(); + } + } + + _critSect.Leave(); + SleepMs(10 - (_clock->CurrentNtpInMilliseconds() - currentTime)); + return true; +} + +} // namespace webrtc diff --git a/modules/audio_device/dummy/file_audio_device.h b/modules/audio_device/dummy/file_audio_device.h new file mode 100644 index 00000000..6f417eb2 --- /dev/null +++ b/modules/audio_device/dummy/file_audio_device.h @@ -0,0 +1,202 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H +#define WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H + +#include <stdio.h> + +#include <string> + +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/clock.h" + +namespace webrtc { +class EventWrapper; +class ThreadWrapper; + +// This is a fake audio device which plays audio from a file as its microphone +// and plays out into a file. +class FileAudioDevice : public AudioDeviceGeneric { + public: + // Constructs a file audio device with |id|. It will read audio from + // |inputFilename| and record output audio to |outputFilename|. + // + // The input file should be a readable 48k stereo raw file, and the output + // file should point to a writable location. The output format will also be + // 48k stereo raw audio. + FileAudioDevice(const int32_t id, + const char* inputFilename, + const char* outputFilename); + virtual ~FileAudioDevice(); + + // Retrieve the currently utilized audio layer + virtual int32_t ActiveAudioLayer( + AudioDeviceModule::AudioLayer& audioLayer) const OVERRIDE; + + // Main initializaton and termination + virtual int32_t Init() OVERRIDE; + virtual int32_t Terminate() OVERRIDE; + virtual bool Initialized() const OVERRIDE; + + // Device enumeration + virtual int16_t PlayoutDevices() OVERRIDE; + virtual int16_t RecordingDevices() OVERRIDE; + virtual int32_t PlayoutDeviceName(uint16_t index, + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) OVERRIDE; + virtual int32_t RecordingDeviceName(uint16_t index, + char name[kAdmMaxDeviceNameSize], + char guid[kAdmMaxGuidSize]) OVERRIDE; + + // Device selection + virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE; + virtual int32_t SetPlayoutDevice( + AudioDeviceModule::WindowsDeviceType device) OVERRIDE; + virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE; + virtual int32_t SetRecordingDevice( + AudioDeviceModule::WindowsDeviceType device) OVERRIDE; + + // Audio transport initialization + virtual int32_t PlayoutIsAvailable(bool& available) OVERRIDE; + virtual int32_t InitPlayout() OVERRIDE; + virtual bool PlayoutIsInitialized() const OVERRIDE; + virtual int32_t RecordingIsAvailable(bool& available) OVERRIDE; + virtual int32_t InitRecording() OVERRIDE; + virtual bool RecordingIsInitialized() const OVERRIDE; + + // Audio transport control + virtual int32_t StartPlayout() OVERRIDE; + virtual int32_t StopPlayout() OVERRIDE; + virtual bool Playing() const OVERRIDE; + virtual int32_t StartRecording() OVERRIDE; + virtual int32_t StopRecording() OVERRIDE; + virtual bool Recording() const OVERRIDE; + + // Microphone Automatic Gain Control (AGC) + virtual int32_t SetAGC(bool enable) OVERRIDE; + virtual bool AGC() const OVERRIDE; + + // Volume control based on the Windows Wave API (Windows only) + virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, + uint16_t volumeRight) OVERRIDE; + virtual int32_t WaveOutVolume(uint16_t& volumeLeft, + uint16_t& volumeRight) const OVERRIDE; + + // Audio mixer initialization + virtual int32_t InitSpeaker() OVERRIDE; + virtual bool SpeakerIsInitialized() const OVERRIDE; + virtual int32_t InitMicrophone() OVERRIDE; + virtual bool MicrophoneIsInitialized() const OVERRIDE; + + // Speaker volume controls + virtual int32_t SpeakerVolumeIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE; + virtual int32_t SpeakerVolume(uint32_t& volume) const OVERRIDE; + virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const OVERRIDE; + virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const OVERRIDE; + virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const OVERRIDE; + + // Microphone volume controls + virtual int32_t MicrophoneVolumeIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE; + virtual int32_t MicrophoneVolume(uint32_t& volume) const OVERRIDE; + virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const OVERRIDE; + virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const OVERRIDE; + virtual int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const OVERRIDE; + + // Speaker mute control + virtual int32_t SpeakerMuteIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetSpeakerMute(bool enable) OVERRIDE; + virtual int32_t SpeakerMute(bool& enabled) const OVERRIDE; + + // Microphone mute control + virtual int32_t MicrophoneMuteIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE; + virtual int32_t MicrophoneMute(bool& enabled) const OVERRIDE; + + // Microphone boost control + virtual int32_t MicrophoneBoostIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE; + virtual int32_t MicrophoneBoost(bool& enabled) const OVERRIDE; + + // Stereo support + virtual int32_t StereoPlayoutIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetStereoPlayout(bool enable) OVERRIDE; + virtual int32_t StereoPlayout(bool& enabled) const OVERRIDE; + virtual int32_t StereoRecordingIsAvailable(bool& available) OVERRIDE; + virtual int32_t SetStereoRecording(bool enable) OVERRIDE; + virtual int32_t StereoRecording(bool& enabled) const OVERRIDE; + + // Delay information and control + virtual int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type, + uint16_t sizeMS) OVERRIDE; + virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type, + uint16_t& sizeMS) const OVERRIDE; + virtual int32_t PlayoutDelay(uint16_t& delayMS) const OVERRIDE; + virtual int32_t RecordingDelay(uint16_t& delayMS) const OVERRIDE; + + // CPU load + virtual int32_t CPULoad(uint16_t& load) const OVERRIDE; + + virtual bool PlayoutWarning() const OVERRIDE; + virtual bool PlayoutError() const OVERRIDE; + virtual bool RecordingWarning() const OVERRIDE; + virtual bool RecordingError() const OVERRIDE; + virtual void ClearPlayoutWarning() OVERRIDE; + virtual void ClearPlayoutError() OVERRIDE; + virtual void ClearRecordingWarning() OVERRIDE; + virtual void ClearRecordingError() OVERRIDE; + + virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) OVERRIDE; + + private: + static bool RecThreadFunc(void*); + static bool PlayThreadFunc(void*); + bool RecThreadProcess(); + bool PlayThreadProcess(); + + int32_t _playout_index; + int32_t _record_index; + AudioDeviceModule::BufferType _playBufType; + AudioDeviceBuffer* _ptrAudioBuffer; + int8_t* _recordingBuffer; // In bytes. + int8_t* _playoutBuffer; // In bytes. + uint32_t _recordingFramesLeft; + uint32_t _playoutFramesLeft; + CriticalSectionWrapper& _critSect; + + uint32_t _recordingBufferSizeIn10MS; + uint32_t _recordingFramesIn10MS; + uint32_t _playoutFramesIn10MS; + + ThreadWrapper* _ptrThreadRec; + ThreadWrapper* _ptrThreadPlay; + uint32_t _recThreadID; + uint32_t _playThreadID; + + bool _playing; + bool _recording; + uint64_t _lastCallPlayoutMillis; + uint64_t _lastCallRecordMillis; + + FileWrapper& _outputFile; + FileWrapper& _inputFile; + std::string _outputFilename; + std::string _inputFilename; + + Clock* _clock; +}; + +} // namespace webrtc + +#endif // WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H diff --git a/modules/audio_device/dummy/file_audio_device_factory.cc b/modules/audio_device/dummy/file_audio_device_factory.cc new file mode 100644 index 00000000..db35bf11 --- /dev/null +++ b/modules/audio_device/dummy/file_audio_device_factory.cc @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h" + +#include <cstring> + +#include "webrtc/modules/audio_device/dummy/file_audio_device.h" + +namespace webrtc { + +char FileAudioDeviceFactory::_inputAudioFilename[MAX_FILENAME_LEN] = ""; +char FileAudioDeviceFactory::_outputAudioFilename[MAX_FILENAME_LEN] = ""; + +FileAudioDevice* FileAudioDeviceFactory::CreateFileAudioDevice( + const int32_t id) { + // Bail out here if the files aren't set. + if (strlen(_inputAudioFilename) == 0 || strlen(_outputAudioFilename) == 0) { + printf("Was compiled with WEBRTC_DUMMY_AUDIO_PLAY_STATIC_FILE " + "but did not set input/output files to use. Bailing out.\n"); + exit(1); + } + return new FileAudioDevice(id, _inputAudioFilename, _outputAudioFilename); +} + +void FileAudioDeviceFactory::SetFilenamesToUse( + const char* inputAudioFilename, const char* outputAudioFilename) { + assert(strlen(inputAudioFilename) < MAX_FILENAME_LEN && + strlen(outputAudioFilename) < MAX_FILENAME_LEN); + + // Copy the strings since we don't know the lifetime of the input pointers. + strncpy(_inputAudioFilename, inputAudioFilename, MAX_FILENAME_LEN); + strncpy(_outputAudioFilename, outputAudioFilename, MAX_FILENAME_LEN); +} + +} // namespace webrtc diff --git a/modules/audio_device/dummy/file_audio_device_factory.h b/modules/audio_device/dummy/file_audio_device_factory.h new file mode 100644 index 00000000..9975d7b9 --- /dev/null +++ b/modules/audio_device/dummy/file_audio_device_factory.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H +#define WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H + +#include "webrtc/common_types.h" + +namespace webrtc { + +class FileAudioDevice; + +// This class is used by audio_device_impl.cc when WebRTC is compiled with +// WEBRTC_DUMMY_FILE_DEVICES. The application must include this file and set the +// filenames to use before the audio device module is initialized. This is +// intended for test tools which use the audio device module. +class FileAudioDeviceFactory { + public: + static FileAudioDevice* CreateFileAudioDevice(const int32_t id); + + // The input file must be a readable 48k stereo raw file. The output + // file must be writable. The strings will be copied. + static void SetFilenamesToUse(const char* inputAudioFilename, + const char* outputAudioFilename); + + private: + static const uint32_t MAX_FILENAME_LEN = 256; + static char _inputAudioFilename[MAX_FILENAME_LEN]; + static char _outputAudioFilename[MAX_FILENAME_LEN]; +}; + +} // namespace webrtc + +#endif // WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H diff --git a/modules/audio_processing.target.darwin-arm.mk b/modules/audio_processing.target.darwin-arm.mk index ed6d4d4e..1f7c1c97 100644 --- a/modules/audio_processing.target.darwin-arm.mk +++ b/modules/audio_processing.target.darwin-arm.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -158,6 +159,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -243,6 +245,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -288,6 +291,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.darwin-arm64.mk b/modules/audio_processing.target.darwin-arm64.mk index 144e06e1..12d3e688 100644 --- a/modules/audio_processing.target.darwin-arm64.mk +++ b/modules/audio_processing.target.darwin-arm64.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -260,6 +263,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.darwin-mips.mk b/modules/audio_processing.target.darwin-mips.mk index a9f2b593..9aa97e1d 100644 --- a/modules/audio_processing.target.darwin-mips.mk +++ b/modules/audio_processing.target.darwin-mips.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -154,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -235,6 +237,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -279,6 +282,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.darwin-x86.mk b/modules/audio_processing.target.darwin-x86.mk index 659aaed4..8a9765bf 100644 --- a/modules/audio_processing.target.darwin-x86.mk +++ b/modules/audio_processing.target.darwin-x86.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -270,6 +273,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.darwin-x86_64.mk b/modules/audio_processing.target.darwin-x86_64.mk index c4725056..c8b84ef6 100644 --- a/modules/audio_processing.target.darwin-x86_64.mk +++ b/modules/audio_processing.target.darwin-x86_64.mk @@ -107,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -148,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -226,6 +228,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -268,6 +271,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.linux-arm.mk b/modules/audio_processing.target.linux-arm.mk index ed6d4d4e..1f7c1c97 100644 --- a/modules/audio_processing.target.linux-arm.mk +++ b/modules/audio_processing.target.linux-arm.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -158,6 +159,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -243,6 +245,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -288,6 +291,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.linux-arm64.mk b/modules/audio_processing.target.linux-arm64.mk index 144e06e1..12d3e688 100644 --- a/modules/audio_processing.target.linux-arm64.mk +++ b/modules/audio_processing.target.linux-arm64.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -260,6 +263,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.linux-mips.mk b/modules/audio_processing.target.linux-mips.mk index a9f2b593..9aa97e1d 100644 --- a/modules/audio_processing.target.linux-mips.mk +++ b/modules/audio_processing.target.linux-mips.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -154,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -235,6 +237,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -279,6 +282,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.linux-x86.mk b/modules/audio_processing.target.linux-x86.mk index 659aaed4..8a9765bf 100644 --- a/modules/audio_processing.target.linux-x86.mk +++ b/modules/audio_processing.target.linux-x86.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -270,6 +273,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing.target.linux-x86_64.mk b/modules/audio_processing.target.linux-x86_64.mk index c4725056..c8b84ef6 100644 --- a/modules/audio_processing.target.linux-x86_64.mk +++ b/modules/audio_processing.target.linux-x86_64.mk @@ -107,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -148,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -226,6 +228,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -268,6 +271,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/OWNERS b/modules/audio_processing/OWNERS index 213272a9..7c1f7881 100644 --- a/modules/audio_processing/OWNERS +++ b/modules/audio_processing/OWNERS @@ -1,3 +1,4 @@ +aluebs@webrtc.org andrew@webrtc.org bjornv@webrtc.org diff --git a/modules/audio_processing/aec/Android.mk b/modules/audio_processing/aec/Android.mk index 3ad52b96..181e87d9 100644 --- a/modules/audio_processing/aec/Android.mk +++ b/modules/audio_processing/aec/Android.mk @@ -47,3 +47,12 @@ ifndef NDK_ROOT include external/stlport/libstlport.mk endif include $(BUILD_STATIC_LIBRARY) + +######################### +# Build the neon library. +ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) + +LOCAL_SRC_FILES += \ + aec_core_neon.c + +endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) diff --git a/modules/audio_processing/aec/aec_core.c b/modules/audio_processing/aec/aec_core.c index 2d2116a4..207c6dc3 100644 --- a/modules/audio_processing/aec/aec_core.c +++ b/modules/audio_processing/aec/aec_core.c @@ -67,7 +67,7 @@ static const float sqrtHanning[65] = { // Matlab code to produce table: // weightCurve = [0 ; 0.3 * sqrt(linspace(0,1,64))' + 0.1]; // fprintf(1, '\t%.4f, %.4f, %.4f, %.4f, %.4f, %.4f,\n', weightCurve); -const float WebRtcAec_weightCurve[65] = { +ALIGN16_BEG const float ALIGN16_END WebRtcAec_weightCurve[65] = { 0.0000f, 0.1000f, 0.1378f, 0.1535f, 0.1655f, 0.1756f, 0.1845f, 0.1926f, 0.2000f, 0.2069f, 0.2134f, 0.2195f, 0.2254f, 0.2309f, 0.2363f, 0.2414f, 0.2464f, 0.2512f, 0.2558f, 0.2604f, 0.2648f, 0.2690f, 0.2732f, 0.2773f, @@ -81,7 +81,7 @@ const float WebRtcAec_weightCurve[65] = { // Matlab code to produce table: // overDriveCurve = [sqrt(linspace(0,1,65))' + 1]; // fprintf(1, '\t%.4f, %.4f, %.4f, %.4f, %.4f, %.4f,\n', overDriveCurve); -const float WebRtcAec_overDriveCurve[65] = { +ALIGN16_BEG const float ALIGN16_END WebRtcAec_overDriveCurve[65] = { 1.0000f, 1.1250f, 1.1768f, 1.2165f, 1.2500f, 1.2795f, 1.3062f, 1.3307f, 1.3536f, 1.3750f, 1.3953f, 1.4146f, 1.4330f, 1.4507f, 1.4677f, 1.4841f, 1.5000f, 1.5154f, 1.5303f, 1.5449f, 1.5590f, 1.5728f, 1.5863f, 1.5995f, @@ -582,6 +582,10 @@ int WebRtcAec_InitAec(AecCore* aec, int sampFreq) { WebRtcAec_InitAec_mips(); #endif +#if defined(WEBRTC_DETECT_ARM_NEON) || defined(WEBRTC_ARCH_ARM_NEON) + WebRtcAec_InitAec_neon(); +#endif + aec_rdft_init(); return 0; diff --git a/modules/audio_processing/aec/aec_core.h b/modules/audio_processing/aec/aec_core.h index cd2acfe6..93bfed46 100644 --- a/modules/audio_processing/aec/aec_core.h +++ b/modules/audio_processing/aec/aec_core.h @@ -57,6 +57,9 @@ void WebRtcAec_InitAec_SSE2(void); #if defined(MIPS_FPU_LE) void WebRtcAec_InitAec_mips(void); #endif +#if defined(WEBRTC_DETECT_ARM_NEON) || defined(WEBRTC_ARCH_ARM_NEON) +void WebRtcAec_InitAec_neon(void); +#endif void WebRtcAec_BufferFarendPartition(AecCore* aec, const float* farend); void WebRtcAec_ProcessFrame(AecCore* aec, diff --git a/modules/audio_processing/aec/aec_core_neon.c b/modules/audio_processing/aec/aec_core_neon.c new file mode 100644 index 00000000..d751a4b1 --- /dev/null +++ b/modules/audio_processing/aec/aec_core_neon.c @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +/* + * The core AEC algorithm, neon version of speed-critical functions. + * + * Based on aec_core_sse2.c. + */ + +#include "webrtc/modules/audio_processing/aec/aec_core.h" + +#include <arm_neon.h> +#include <math.h> + +#include "webrtc/modules/audio_processing/aec/aec_core_internal.h" +#include "webrtc/modules/audio_processing/aec/aec_rdft.h" + +enum { kShiftExponentIntoTopMantissa = 8 }; +enum { kFloatExponentShift = 23 }; + +extern const float WebRtcAec_weightCurve[65]; +extern const float WebRtcAec_overDriveCurve[65]; + +static float32x4_t vpowq_f32(float32x4_t a, float32x4_t b) { + // a^b = exp2(b * log2(a)) + // exp2(x) and log2(x) are calculated using polynomial approximations. + float32x4_t log2_a, b_log2_a, a_exp_b; + + // Calculate log2(x), x = a. + { + // To calculate log2(x), we decompose x like this: + // x = y * 2^n + // n is an integer + // y is in the [1.0, 2.0) range + // + // log2(x) = log2(y) + n + // n can be evaluated by playing with float representation. + // log2(y) in a small range can be approximated, this code uses an order + // five polynomial approximation. The coefficients have been + // estimated with the Remez algorithm and the resulting + // polynomial has a maximum relative error of 0.00086%. + + // Compute n. + // This is done by masking the exponent, shifting it into the top bit of + // the mantissa, putting eight into the biased exponent (to shift/ + // compensate the fact that the exponent has been shifted in the top/ + // fractional part and finally getting rid of the implicit leading one + // from the mantissa by substracting it out. + const uint32x4_t vec_float_exponent_mask = vdupq_n_u32(0x7F800000); + const uint32x4_t vec_eight_biased_exponent = vdupq_n_u32(0x43800000); + const uint32x4_t vec_implicit_leading_one = vdupq_n_u32(0x43BF8000); + const uint32x4_t two_n = vandq_u32(vreinterpretq_u32_f32(a), + vec_float_exponent_mask); + const uint32x4_t n_1 = vshrq_n_u32(two_n, kShiftExponentIntoTopMantissa); + const uint32x4_t n_0 = vorrq_u32(n_1, vec_eight_biased_exponent); + const float32x4_t n = + vsubq_f32(vreinterpretq_f32_u32(n_0), + vreinterpretq_f32_u32(vec_implicit_leading_one)); + // Compute y. + const uint32x4_t vec_mantissa_mask = vdupq_n_u32(0x007FFFFF); + const uint32x4_t vec_zero_biased_exponent_is_one = vdupq_n_u32(0x3F800000); + const uint32x4_t mantissa = vandq_u32(vreinterpretq_u32_f32(a), + vec_mantissa_mask); + const float32x4_t y = + vreinterpretq_f32_u32(vorrq_u32(mantissa, + vec_zero_biased_exponent_is_one)); + // Approximate log2(y) ~= (y - 1) * pol5(y). + // pol5(y) = C5 * y^5 + C4 * y^4 + C3 * y^3 + C2 * y^2 + C1 * y + C0 + const float32x4_t C5 = vdupq_n_f32(-3.4436006e-2f); + const float32x4_t C4 = vdupq_n_f32(3.1821337e-1f); + const float32x4_t C3 = vdupq_n_f32(-1.2315303f); + const float32x4_t C2 = vdupq_n_f32(2.5988452f); + const float32x4_t C1 = vdupq_n_f32(-3.3241990f); + const float32x4_t C0 = vdupq_n_f32(3.1157899f); + float32x4_t pol5_y = C5; + pol5_y = vmlaq_f32(C4, y, pol5_y); + pol5_y = vmlaq_f32(C3, y, pol5_y); + pol5_y = vmlaq_f32(C2, y, pol5_y); + pol5_y = vmlaq_f32(C1, y, pol5_y); + pol5_y = vmlaq_f32(C0, y, pol5_y); + const float32x4_t y_minus_one = + vsubq_f32(y, vreinterpretq_f32_u32(vec_zero_biased_exponent_is_one)); + const float32x4_t log2_y = vmulq_f32(y_minus_one, pol5_y); + + // Combine parts. + log2_a = vaddq_f32(n, log2_y); + } + + // b * log2(a) + b_log2_a = vmulq_f32(b, log2_a); + + // Calculate exp2(x), x = b * log2(a). + { + // To calculate 2^x, we decompose x like this: + // x = n + y + // n is an integer, the value of x - 0.5 rounded down, therefore + // y is in the [0.5, 1.5) range + // + // 2^x = 2^n * 2^y + // 2^n can be evaluated by playing with float representation. + // 2^y in a small range can be approximated, this code uses an order two + // polynomial approximation. The coefficients have been estimated + // with the Remez algorithm and the resulting polynomial has a + // maximum relative error of 0.17%. + // To avoid over/underflow, we reduce the range of input to ]-127, 129]. + const float32x4_t max_input = vdupq_n_f32(129.f); + const float32x4_t min_input = vdupq_n_f32(-126.99999f); + const float32x4_t x_min = vminq_f32(b_log2_a, max_input); + const float32x4_t x_max = vmaxq_f32(x_min, min_input); + // Compute n. + const float32x4_t half = vdupq_n_f32(0.5f); + const float32x4_t x_minus_half = vsubq_f32(x_max, half); + const int32x4_t x_minus_half_floor = vcvtq_s32_f32(x_minus_half); + + // Compute 2^n. + const int32x4_t float_exponent_bias = vdupq_n_s32(127); + const int32x4_t two_n_exponent = + vaddq_s32(x_minus_half_floor, float_exponent_bias); + const float32x4_t two_n = + vreinterpretq_f32_s32(vshlq_n_s32(two_n_exponent, kFloatExponentShift)); + // Compute y. + const float32x4_t y = vsubq_f32(x_max, vcvtq_f32_s32(x_minus_half_floor)); + + // Approximate 2^y ~= C2 * y^2 + C1 * y + C0. + const float32x4_t C2 = vdupq_n_f32(3.3718944e-1f); + const float32x4_t C1 = vdupq_n_f32(6.5763628e-1f); + const float32x4_t C0 = vdupq_n_f32(1.0017247f); + float32x4_t exp2_y = C2; + exp2_y = vmlaq_f32(C1, y, exp2_y); + exp2_y = vmlaq_f32(C0, y, exp2_y); + + // Combine parts. + a_exp_b = vmulq_f32(exp2_y, two_n); + } + + return a_exp_b; +} + +static void OverdriveAndSuppressNEON(AecCore* aec, + float hNl[PART_LEN1], + const float hNlFb, + float efw[2][PART_LEN1]) { + int i; + const float32x4_t vec_hNlFb = vmovq_n_f32(hNlFb); + const float32x4_t vec_one = vdupq_n_f32(1.0f); + const float32x4_t vec_minus_one = vdupq_n_f32(-1.0f); + const float32x4_t vec_overDriveSm = vmovq_n_f32(aec->overDriveSm); + + // vectorized code (four at once) + for (i = 0; i + 3 < PART_LEN1; i += 4) { + // Weight subbands + float32x4_t vec_hNl = vld1q_f32(&hNl[i]); + const float32x4_t vec_weightCurve = vld1q_f32(&WebRtcAec_weightCurve[i]); + const uint32x4_t bigger = vcgtq_f32(vec_hNl, vec_hNlFb); + const float32x4_t vec_weightCurve_hNlFb = vmulq_f32(vec_weightCurve, + vec_hNlFb); + const float32x4_t vec_one_weightCurve = vsubq_f32(vec_one, vec_weightCurve); + const float32x4_t vec_one_weightCurve_hNl = vmulq_f32(vec_one_weightCurve, + vec_hNl); + const uint32x4_t vec_if0 = vandq_u32(vmvnq_u32(bigger), + vreinterpretq_u32_f32(vec_hNl)); + const float32x4_t vec_one_weightCurve_add = + vaddq_f32(vec_weightCurve_hNlFb, vec_one_weightCurve_hNl); + const uint32x4_t vec_if1 = + vandq_u32(bigger, vreinterpretq_u32_f32(vec_one_weightCurve_add)); + + vec_hNl = vreinterpretq_f32_u32(vorrq_u32(vec_if0, vec_if1)); + + { + const float32x4_t vec_overDriveCurve = + vld1q_f32(&WebRtcAec_overDriveCurve[i]); + const float32x4_t vec_overDriveSm_overDriveCurve = + vmulq_f32(vec_overDriveSm, vec_overDriveCurve); + vec_hNl = vpowq_f32(vec_hNl, vec_overDriveSm_overDriveCurve); + vst1q_f32(&hNl[i], vec_hNl); + } + + // Suppress error signal + { + float32x4_t vec_efw_re = vld1q_f32(&efw[0][i]); + float32x4_t vec_efw_im = vld1q_f32(&efw[1][i]); + vec_efw_re = vmulq_f32(vec_efw_re, vec_hNl); + vec_efw_im = vmulq_f32(vec_efw_im, vec_hNl); + + // Ooura fft returns incorrect sign on imaginary component. It matters + // here because we are making an additive change with comfort noise. + vec_efw_im = vmulq_f32(vec_efw_im, vec_minus_one); + vst1q_f32(&efw[0][i], vec_efw_re); + vst1q_f32(&efw[1][i], vec_efw_im); + } + } + + // scalar code for the remaining items. + for (; i < PART_LEN1; i++) { + // Weight subbands + if (hNl[i] > hNlFb) { + hNl[i] = WebRtcAec_weightCurve[i] * hNlFb + + (1 - WebRtcAec_weightCurve[i]) * hNl[i]; + } + + hNl[i] = powf(hNl[i], aec->overDriveSm * WebRtcAec_overDriveCurve[i]); + + // Suppress error signal + efw[0][i] *= hNl[i]; + efw[1][i] *= hNl[i]; + + // Ooura fft returns incorrect sign on imaginary component. It matters + // here because we are making an additive change with comfort noise. + efw[1][i] *= -1; + } +} + +void WebRtcAec_InitAec_neon(void) { + WebRtcAec_OverdriveAndSuppress = OverdriveAndSuppressNEON; +} + diff --git a/modules/audio_processing/agc/digital_agc.c b/modules/audio_processing/agc/digital_agc.c index faef9141..4b169c18 100644 --- a/modules/audio_processing/agc/digital_agc.c +++ b/modules/audio_processing/agc/digital_agc.c @@ -118,7 +118,7 @@ int32_t WebRtcAgc_CalculateGainTable(int32_t *gainTable, // Q16 limiterLvlX = analogTarget - limiterOffset; limiterIdx = 2 + WebRtcSpl_DivW32W16ResW16(WEBRTC_SPL_LSHIFT_W32((int32_t)limiterLvlX, 13), - WEBRTC_SPL_RSHIFT_U16(kLog10_2, 1)); + (kLog10_2 / 2)); tmp16no1 = WebRtcSpl_DivW32W16ResW16(limiterOffset + (kCompRatio >> 1), kCompRatio); limiterLvl = targetLevelDbfs + tmp16no1; @@ -773,7 +773,7 @@ int16_t WebRtcAgc_ProcessVad(AgcVad_t *state, // (i) VAD state tmp16 = WEBRTC_SPL_LSHIFT_W16(3, 12); tmp32 = WEBRTC_SPL_MUL_16_16(tmp16, (dB - state->meanLongTerm)); tmp32 = WebRtcSpl_DivW32W16(tmp32, state->stdLongTerm); - tmpU16 = WEBRTC_SPL_LSHIFT_U16((uint16_t)13, 12); + tmpU16 = (13 << 12); tmp32b = WEBRTC_SPL_MUL_16_U16(state->logRatio, tmpU16); tmp32 += WEBRTC_SPL_RSHIFT_W32(tmp32b, 10); diff --git a/modules/audio_processing/audio_processing.gypi b/modules/audio_processing/audio_processing.gypi index c73bb2a4..b1d18c5b 100644 --- a/modules/audio_processing/audio_processing.gypi +++ b/modules/audio_processing/audio_processing.gypi @@ -199,6 +199,7 @@ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', ], 'sources': [ + 'aec/aec_core_neon.c', 'aecm/aecm_core_neon.c', 'ns/nsx_core_neon.c', ], diff --git a/modules/audio_processing/echo_cancellation_impl.cc b/modules/audio_processing/echo_cancellation_impl.cc index 8cf3410b..e770f9fe 100644 --- a/modules/audio_processing/echo_cancellation_impl.cc +++ b/modules/audio_processing/echo_cancellation_impl.cc @@ -323,6 +323,7 @@ int EchoCancellationImpl::Initialize() { void EchoCancellationImpl::SetExtraOptions(const Config& config) { delay_correction_enabled_ = config.Get<DelayCorrection>().enabled; + reported_delay_enabled_ = config.Get<ReportedDelay>().enabled; Configure(); } diff --git a/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc index 37f2f094..49bcf945 100644 --- a/modules/audio_processing/echo_cancellation_impl_unittest.cc +++ b/modules/audio_processing/echo_cancellation_impl_unittest.cc @@ -18,7 +18,7 @@ extern "C" { namespace webrtc { -TEST(EchoCancellationInternalTest, DISABLED_ON_ANDROID(DelayCorrection)) { +TEST(EchoCancellationInternalTest, DelayCorrection) { scoped_ptr<AudioProcessing> ap(AudioProcessing::Create(0)); EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); @@ -48,4 +48,34 @@ TEST(EchoCancellationInternalTest, DISABLED_ON_ANDROID(DelayCorrection)) { EXPECT_EQ(0, WebRtcAec_delay_correction_enabled(aec_core)); } +TEST(EchoCancellationInternalTest, ReportedDelay) { + scoped_ptr<AudioProcessing> ap(AudioProcessing::Create(0)); + EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); + + EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true)); + EXPECT_TRUE(ap->echo_cancellation()->is_enabled()); + + AecCore* aec_core = ap->echo_cancellation()->aec_core(); + ASSERT_TRUE(aec_core != NULL); + // Enabled by default. + EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core)); + + Config config; + config.Set<ReportedDelay>(new ReportedDelay(false)); + ap->SetExtraOptions(config); + EXPECT_EQ(0, WebRtcAec_reported_delay_enabled(aec_core)); + + // Retains setting after initialization. + EXPECT_EQ(ap->kNoError, ap->Initialize()); + EXPECT_EQ(0, WebRtcAec_reported_delay_enabled(aec_core)); + + config.Set<ReportedDelay>(new ReportedDelay(true)); + ap->SetExtraOptions(config); + EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core)); + + // Retains setting after initialization. + EXPECT_EQ(ap->kNoError, ap->Initialize()); + EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core)); +} + } // namespace webrtc diff --git a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk index 332f4cc0..adeadc3c 100644 --- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk +++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -223,6 +225,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk index 332f4cc0..adeadc3c 100644 --- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk +++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -223,6 +225,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk index e63adfd7..81955001 100644 --- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk +++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -223,6 +225,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk index e63adfd7..81955001 100644 --- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk +++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -223,6 +225,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 15e01b95..77c3f3ad 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -53,6 +53,18 @@ struct DelayCorrection { bool enabled; }; +// Use to disable the reported system delays. By disabling the reported system +// delays the echo cancellation algorithm assumes the process and reverse +// streams to be aligned. This configuration only applies to EchoCancellation +// and not EchoControlMobile and is set with AudioProcessing::SetExtraOptions(). +// Note that by disabling reported system delays the EchoCancellation may +// regress in performance. +struct ReportedDelay { + ReportedDelay() : enabled(true) {} + explicit ReportedDelay(bool enabled) : enabled(enabled) {} + bool enabled; +}; + // Must be provided through AudioProcessing::Create(Confg&). It will have no // impact if used with AudioProcessing::SetExtraOptions(). struct ExperimentalAgc { diff --git a/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk b/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk index ec44bcfe..d49c7aa5 100644 --- a/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk +++ b/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk b/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk index ec44bcfe..d49c7aa5 100644 --- a/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk +++ b/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing/noise_suppression_impl.cc b/modules/audio_processing/noise_suppression_impl.cc index c3eb7b01..eea0a04a 100644 --- a/modules/audio_processing/noise_suppression_impl.cc +++ b/modules/audio_processing/noise_suppression_impl.cc @@ -68,10 +68,10 @@ int NoiseSuppressionImpl::ProcessCaptureAudio(AudioBuffer* audio) { Handle* my_handle = static_cast<Handle*>(handle(i)); #if defined(WEBRTC_NS_FLOAT) err = WebRtcNs_Process(static_cast<Handle*>(handle(i)), - audio->low_pass_split_data(i), - audio->high_pass_split_data(i), - audio->low_pass_split_data(i), - audio->high_pass_split_data(i)); + audio->low_pass_split_data_f(i), + audio->high_pass_split_data_f(i), + audio->low_pass_split_data_f(i), + audio->high_pass_split_data_f(i)); #elif defined(WEBRTC_NS_FIXED) err = WebRtcNsx_Process(static_cast<Handle*>(handle(i)), audio->low_pass_split_data(i), diff --git a/modules/audio_processing/ns/include/noise_suppression.h b/modules/audio_processing/ns/include/noise_suppression.h index 32b18038..3cf889e2 100644 --- a/modules/audio_processing/ns/include/noise_suppression.h +++ b/modules/audio_processing/ns/include/noise_suppression.h @@ -99,10 +99,10 @@ int WebRtcNs_set_policy(NsHandle* NS_inst, int mode); * -1 - Error */ int WebRtcNs_Process(NsHandle* NS_inst, - short* spframe, - short* spframe_H, - short* outframe, - short* outframe_H); + float* spframe, + float* spframe_H, + float* outframe, + float* outframe_H); /* Returns the internally used prior speech probability of the current frame. * There is a frequency bin based one as well, with which this should not be diff --git a/modules/audio_processing/ns/noise_suppression.c b/modules/audio_processing/ns/noise_suppression.c index 848467f0..075ab88c 100644 --- a/modules/audio_processing/ns/noise_suppression.c +++ b/modules/audio_processing/ns/noise_suppression.c @@ -43,8 +43,8 @@ int WebRtcNs_set_policy(NsHandle* NS_inst, int mode) { } -int WebRtcNs_Process(NsHandle* NS_inst, short* spframe, short* spframe_H, - short* outframe, short* outframe_H) { +int WebRtcNs_Process(NsHandle* NS_inst, float* spframe, float* spframe_H, + float* outframe, float* outframe_H) { return WebRtcNs_ProcessCore( (NSinst_t*) NS_inst, spframe, spframe_H, outframe, outframe_H); } diff --git a/modules/audio_processing/ns/ns_core.c b/modules/audio_processing/ns/ns_core.c index 124a66d8..ec267ae0 100644 --- a/modules/audio_processing/ns/ns_core.c +++ b/modules/audio_processing/ns/ns_core.c @@ -715,10 +715,10 @@ void WebRtcNs_SpeechNoiseProb(NSinst_t* inst, float* probSpeechFinal, float* snr } int WebRtcNs_ProcessCore(NSinst_t* inst, - short* speechFrame, - short* speechFrameHB, - short* outFrame, - short* outFrameHB) { + float* speechFrame, + float* speechFrameHB, + float* outFrame, + float* outFrameHB) { // main routine for noise reduction int flagHB = 0; @@ -731,8 +731,8 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, float snrPrior, currentEstimateStsa; float tmpFloat1, tmpFloat2, tmpFloat3, probSpeech, probNonSpeech; float gammaNoiseTmp, gammaNoiseOld; - float noiseUpdateTmp, fTmp, dTmp; - float fin[BLOCKL_MAX], fout[BLOCKL_MAX]; + float noiseUpdateTmp, fTmp; + float fout[BLOCKL_MAX]; float winData[ANAL_BLOCKL_MAX]; float magn[HALF_ANAL_BLOCKL], noise[HALF_ANAL_BLOCKL]; float theFilter[HALF_ANAL_BLOCKL], theFilterTmp[HALF_ANAL_BLOCKL]; @@ -775,26 +775,17 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, updateParsFlag = inst->modelUpdatePars[0]; // - //for LB do all processing - // convert to float - for (i = 0; i < inst->blockLen10ms; i++) { - fin[i] = (float)speechFrame[i]; - } // update analysis buffer for L band memcpy(inst->dataBuf, inst->dataBuf + inst->blockLen10ms, sizeof(float) * (inst->anaLen - inst->blockLen10ms)); - memcpy(inst->dataBuf + inst->anaLen - inst->blockLen10ms, fin, + memcpy(inst->dataBuf + inst->anaLen - inst->blockLen10ms, speechFrame, sizeof(float) * inst->blockLen10ms); if (flagHB == 1) { - // convert to float - for (i = 0; i < inst->blockLen10ms; i++) { - fin[i] = (float)speechFrameHB[i]; - } // update analysis buffer for H band memcpy(inst->dataBufHB, inst->dataBufHB + inst->blockLen10ms, sizeof(float) * (inst->anaLen - inst->blockLen10ms)); - memcpy(inst->dataBufHB + inst->anaLen - inst->blockLen10ms, fin, + memcpy(inst->dataBufHB + inst->anaLen - inst->blockLen10ms, speechFrameHB, sizeof(float) * inst->blockLen10ms); } @@ -833,30 +824,16 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, inst->outBuf[i] = fout[i + inst->blockLen10ms]; } } - // convert to short - for (i = 0; i < inst->blockLen10ms; i++) { - dTmp = fout[i]; - if (dTmp < WEBRTC_SPL_WORD16_MIN) { - dTmp = WEBRTC_SPL_WORD16_MIN; - } else if (dTmp > WEBRTC_SPL_WORD16_MAX) { - dTmp = WEBRTC_SPL_WORD16_MAX; - } - outFrame[i] = (short)dTmp; - } + for (i = 0; i < inst->blockLen10ms; ++i) + outFrame[i] = WEBRTC_SPL_SAT( + WEBRTC_SPL_WORD16_MAX, fout[i], WEBRTC_SPL_WORD16_MIN); // for time-domain gain of HB - if (flagHB == 1) { - for (i = 0; i < inst->blockLen10ms; i++) { - dTmp = inst->dataBufHB[i]; - if (dTmp < WEBRTC_SPL_WORD16_MIN) { - dTmp = WEBRTC_SPL_WORD16_MIN; - } else if (dTmp > WEBRTC_SPL_WORD16_MAX) { - dTmp = WEBRTC_SPL_WORD16_MAX; - } - outFrameHB[i] = (short)dTmp; - } - } // end of H band gain computation - // + if (flagHB == 1) + for (i = 0; i < inst->blockLen10ms; ++i) + outFrameHB[i] = WEBRTC_SPL_SAT( + WEBRTC_SPL_WORD16_MAX, inst->dataBufHB[i], WEBRTC_SPL_WORD16_MIN); + return 0; } @@ -1239,16 +1216,9 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, inst->outLen -= inst->blockLen10ms; } - // convert to short - for (i = 0; i < inst->blockLen10ms; i++) { - dTmp = fout[i]; - if (dTmp < WEBRTC_SPL_WORD16_MIN) { - dTmp = WEBRTC_SPL_WORD16_MIN; - } else if (dTmp > WEBRTC_SPL_WORD16_MAX) { - dTmp = WEBRTC_SPL_WORD16_MAX; - } - outFrame[i] = (short)dTmp; - } + for (i = 0; i < inst->blockLen10ms; ++i) + outFrame[i] = WEBRTC_SPL_SAT( + WEBRTC_SPL_WORD16_MAX, fout[i], WEBRTC_SPL_WORD16_MIN); // for time-domain gain of HB if (flagHB == 1) { @@ -1289,13 +1259,9 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, } //apply gain for (i = 0; i < inst->blockLen10ms; i++) { - dTmp = gainTimeDomainHB * inst->dataBufHB[i]; - if (dTmp < WEBRTC_SPL_WORD16_MIN) { - dTmp = WEBRTC_SPL_WORD16_MIN; - } else if (dTmp > WEBRTC_SPL_WORD16_MAX) { - dTmp = WEBRTC_SPL_WORD16_MAX; - } - outFrameHB[i] = (short)dTmp; + float o = gainTimeDomainHB * inst->dataBufHB[i]; + outFrameHB[i] = WEBRTC_SPL_SAT( + WEBRTC_SPL_WORD16_MAX, o, WEBRTC_SPL_WORD16_MIN); } } // end of H band gain computation // diff --git a/modules/audio_processing/ns/ns_core.h b/modules/audio_processing/ns/ns_core.h index 50daa137..785239eb 100644 --- a/modules/audio_processing/ns/ns_core.h +++ b/modules/audio_processing/ns/ns_core.h @@ -167,10 +167,10 @@ int WebRtcNs_set_policy_core(NSinst_t* inst, int mode); int WebRtcNs_ProcessCore(NSinst_t* inst, - short* inFrameLow, - short* inFrameHigh, - short* outFrameLow, - short* outFrameHigh); + float* inFrameLow, + float* inFrameHigh, + float* outFrameLow, + float* outFrameHigh); #ifdef __cplusplus diff --git a/modules/audio_processing/ns/nsx_core.c b/modules/audio_processing/ns/nsx_core.c index e627a2ef..2c8270f5 100644 --- a/modules/audio_processing/ns/nsx_core.c +++ b/modules/audio_processing/ns/nsx_core.c @@ -1407,9 +1407,9 @@ void WebRtcNsx_DataAnalysis(NsxInst_t* inst, short* speechFrame, uint16_t* magnU tmpU32no1 = WEBRTC_SPL_RSHIFT_U32((uint32_t)sum_log_i_log_magn, 12); // Q5 // Shift the largest value of sum_log_i and tmp32no3 before multiplication - tmp_u16 = WEBRTC_SPL_LSHIFT_U16((uint16_t)sum_log_i, 1); // Q6 + tmp_u16 = ((uint16_t)sum_log_i << 1); // Q6 if ((uint32_t)sum_log_i > tmpU32no1) { - tmp_u16 = WEBRTC_SPL_RSHIFT_U16(tmp_u16, zeros); + tmp_u16 >>= zeros; } else { tmpU32no1 = WEBRTC_SPL_RSHIFT_U32(tmpU32no1, zeros); } @@ -2071,8 +2071,8 @@ int WebRtcNsx_ProcessCore(NsxInst_t* inst, short* speechFrame, short* speechFram tmpU16no1 += nonSpeechProbFinal[i]; // Q8 tmpU32no1 += (uint32_t)(inst->noiseSupFilter[i]); // Q14 } - avgProbSpeechHB = (int16_t)(4096 - - WEBRTC_SPL_RSHIFT_U16(tmpU16no1, inst->stages - 7)); // Q12 + assert(inst->stages >= 7); + avgProbSpeechHB = (4096 - (tmpU16no1 >> (inst->stages - 7))); // Q12 avgFilterGainHB = (int16_t)WEBRTC_SPL_RSHIFT_U32( tmpU32no1, inst->stages - 3); // Q14 diff --git a/modules/audio_processing/test/audio_processing_unittest.cc b/modules/audio_processing/test/audio_processing_unittest.cc index 41cbd7fc..406c3de5 100644 --- a/modules/audio_processing/test/audio_processing_unittest.cc +++ b/modules/audio_processing/test/audio_processing_unittest.cc @@ -1369,7 +1369,7 @@ TEST_F(ApmTest, IdenticalInputChannelsResultInIdenticalOutputChannels) { } } -TEST_F(ApmTest, DISABLED_ON_ANDROID(SplittingFilter)) { +TEST_F(ApmTest, SplittingFilter) { // Verify the filter is not active through undistorted audio when: // 1. No components are enabled... SetFrameTo(frame_, 1000); @@ -1417,6 +1417,11 @@ TEST_F(ApmTest, DISABLED_ON_ANDROID(SplittingFilter)) { // TODO(andrew): This test, and the one below, rely rather tenuously on the // behavior of the AEC. Think of something more robust. EXPECT_EQ(apm_->kNoError, apm_->echo_cancellation()->Enable(true)); + // Make sure we have extended filter enabled. This makes sure nothing is + // touched until we have a farend frame. + Config config; + config.Set<DelayCorrection>(new DelayCorrection(true)); + apm_->SetExtraOptions(config); SetFrameTo(frame_, 1000); frame_copy.CopyFrom(*frame_); EXPECT_EQ(apm_->kNoError, apm_->set_stream_delay_ms(0)); diff --git a/modules/audio_processing_neon.target.darwin-arm.mk b/modules/audio_processing_neon.target.darwin-arm.mk index 562fd9c6..483350ad 100644 --- a/modules/audio_processing_neon.target.darwin-arm.mk +++ b/modules/audio_processing_neon.target.darwin-arm.mk @@ -26,6 +26,7 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ + third_party/webrtc/modules/audio_processing/aec/aec_core_neon.c \ third_party/webrtc/modules/audio_processing/aecm/aecm_core_neon.S \ third_party/webrtc/modules/audio_processing/ns/nsx_core_neon.S @@ -91,6 +92,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -130,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -214,6 +217,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing_neon.target.linux-arm.mk b/modules/audio_processing_neon.target.linux-arm.mk index 562fd9c6..483350ad 100644 --- a/modules/audio_processing_neon.target.linux-arm.mk +++ b/modules/audio_processing_neon.target.linux-arm.mk @@ -26,6 +26,7 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ + third_party/webrtc/modules/audio_processing/aec/aec_core_neon.c \ third_party/webrtc/modules/audio_processing/aecm/aecm_core_neon.S \ third_party/webrtc/modules/audio_processing/ns/nsx_core_neon.S @@ -91,6 +92,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -130,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -214,6 +217,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing_sse2.target.darwin-x86.mk b/modules/audio_processing_sse2.target.darwin-x86.mk index 166a4ba4..eeb829c5 100644 --- a/modules/audio_processing_sse2.target.darwin-x86.mk +++ b/modules/audio_processing_sse2.target.darwin-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing_sse2.target.darwin-x86_64.mk b/modules/audio_processing_sse2.target.darwin-x86_64.mk index dbf0089c..ee3b6d89 100644 --- a/modules/audio_processing_sse2.target.darwin-x86_64.mk +++ b/modules/audio_processing_sse2.target.darwin-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing_sse2.target.linux-x86.mk b/modules/audio_processing_sse2.target.linux-x86.mk index 166a4ba4..eeb829c5 100644 --- a/modules/audio_processing_sse2.target.linux-x86.mk +++ b/modules/audio_processing_sse2.target.linux-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audio_processing_sse2.target.linux-x86_64.mk b/modules/audio_processing_sse2.target.linux-x86_64.mk index dbf0089c..ee3b6d89 100644 --- a/modules/audio_processing_sse2.target.linux-x86_64.mk +++ b/modules/audio_processing_sse2.target.linux-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.darwin-arm.mk b/modules/audioproc_debug_proto.target.darwin-arm.mk index 71e2c094..56ff14ba 100644 --- a/modules/audioproc_debug_proto.target.darwin-arm.mk +++ b/modules/audioproc_debug_proto.target.darwin-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -152,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -276,6 +279,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.darwin-arm64.mk b/modules/audioproc_debug_proto.target.darwin-arm64.mk index e9562b80..eafc7b7f 100644 --- a/modules/audioproc_debug_proto.target.darwin-arm64.mk +++ b/modules/audioproc_debug_proto.target.darwin-arm64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -139,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.darwin-mips.mk b/modules/audioproc_debug_proto.target.darwin-mips.mk index 879632e3..ce1fc7f1 100644 --- a/modules/audioproc_debug_proto.target.darwin-mips.mk +++ b/modules/audioproc_debug_proto.target.darwin-mips.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -147,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +226,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -266,6 +269,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.darwin-x86.mk b/modules/audioproc_debug_proto.target.darwin-x86.mk index 1401363f..ac7a7ace 100644 --- a/modules/audioproc_debug_proto.target.darwin-x86.mk +++ b/modules/audioproc_debug_proto.target.darwin-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -259,6 +262,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.darwin-x86_64.mk b/modules/audioproc_debug_proto.target.darwin-x86_64.mk index f0172b60..046af59a 100644 --- a/modules/audioproc_debug_proto.target.darwin-x86_64.mk +++ b/modules/audioproc_debug_proto.target.darwin-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -143,6 +144,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -257,6 +260,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.linux-arm.mk b/modules/audioproc_debug_proto.target.linux-arm.mk index 71e2c094..56ff14ba 100644 --- a/modules/audioproc_debug_proto.target.linux-arm.mk +++ b/modules/audioproc_debug_proto.target.linux-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -152,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -276,6 +279,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.linux-arm64.mk b/modules/audioproc_debug_proto.target.linux-arm64.mk index e9562b80..eafc7b7f 100644 --- a/modules/audioproc_debug_proto.target.linux-arm64.mk +++ b/modules/audioproc_debug_proto.target.linux-arm64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -139,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.linux-mips.mk b/modules/audioproc_debug_proto.target.linux-mips.mk index 879632e3..ce1fc7f1 100644 --- a/modules/audioproc_debug_proto.target.linux-mips.mk +++ b/modules/audioproc_debug_proto.target.linux-mips.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -147,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +226,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -266,6 +269,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.linux-x86.mk b/modules/audioproc_debug_proto.target.linux-x86.mk index 1401363f..ac7a7ace 100644 --- a/modules/audioproc_debug_proto.target.linux-x86.mk +++ b/modules/audioproc_debug_proto.target.linux-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -259,6 +262,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/audioproc_debug_proto.target.linux-x86_64.mk b/modules/audioproc_debug_proto.target.linux-x86_64.mk index f0172b60..046af59a 100644 --- a/modules/audioproc_debug_proto.target.linux-x86_64.mk +++ b/modules/audioproc_debug_proto.target.linux-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -143,6 +144,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -257,6 +260,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.darwin-arm.mk b/modules/bitrate_controller.target.darwin-arm.mk index 883100d0..182b831d 100644 --- a/modules/bitrate_controller.target.darwin-arm.mk +++ b/modules/bitrate_controller.target.darwin-arm.mk @@ -87,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -205,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -245,6 +248,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.darwin-arm64.mk b/modules/bitrate_controller.target.darwin-arm64.mk index b2e90e49..d5d7bd29 100644 --- a/modules/bitrate_controller.target.darwin-arm64.mk +++ b/modules/bitrate_controller.target.darwin-arm64.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.darwin-mips.mk b/modules/bitrate_controller.target.darwin-mips.mk index f127259c..953a114a 100644 --- a/modules/bitrate_controller.target.darwin-mips.mk +++ b/modules/bitrate_controller.target.darwin-mips.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.darwin-x86.mk b/modules/bitrate_controller.target.darwin-x86.mk index 76edd710..94acf571 100644 --- a/modules/bitrate_controller.target.darwin-x86.mk +++ b/modules/bitrate_controller.target.darwin-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.darwin-x86_64.mk b/modules/bitrate_controller.target.darwin-x86_64.mk index 853136c6..19b49409 100644 --- a/modules/bitrate_controller.target.darwin-x86_64.mk +++ b/modules/bitrate_controller.target.darwin-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.linux-arm.mk b/modules/bitrate_controller.target.linux-arm.mk index 883100d0..182b831d 100644 --- a/modules/bitrate_controller.target.linux-arm.mk +++ b/modules/bitrate_controller.target.linux-arm.mk @@ -87,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -205,6 +207,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -245,6 +248,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.linux-arm64.mk b/modules/bitrate_controller.target.linux-arm64.mk index b2e90e49..d5d7bd29 100644 --- a/modules/bitrate_controller.target.linux-arm64.mk +++ b/modules/bitrate_controller.target.linux-arm64.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.linux-mips.mk b/modules/bitrate_controller.target.linux-mips.mk index f127259c..953a114a 100644 --- a/modules/bitrate_controller.target.linux-mips.mk +++ b/modules/bitrate_controller.target.linux-mips.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.linux-x86.mk b/modules/bitrate_controller.target.linux-x86.mk index 76edd710..94acf571 100644 --- a/modules/bitrate_controller.target.linux-x86.mk +++ b/modules/bitrate_controller.target.linux-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/bitrate_controller.target.linux-x86_64.mk b/modules/bitrate_controller.target.linux-x86_64.mk index 853136c6..19b49409 100644 --- a/modules/bitrate_controller.target.linux-x86_64.mk +++ b/modules/bitrate_controller.target.linux-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/desktop_capture/mouse_cursor_monitor_x11.cc b/modules/desktop_capture/mouse_cursor_monitor_x11.cc index 9e196779..f09593db 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_x11.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_x11.cc @@ -17,6 +17,7 @@ #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" +#include "webrtc/modules/desktop_capture/x11/x_error_trap.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" @@ -145,10 +146,12 @@ void MouseCursorMonitorX11::Capture() { Window root_window; Window child_window; unsigned int mask; + + XErrorTrap error_trap(display()); Bool result = XQueryPointer(display(), window_, &root_window, &child_window, &root_x, &root_y, &win_x, &win_y, &mask); CursorState state; - if (!result) { + if (!result || error_trap.GetLastErrorAndDisable() != 0) { state = OUTSIDE; } else { // In screen mode (window_ == root_window) the mouse is always inside. diff --git a/modules/iLBC.target.darwin-arm.mk b/modules/iLBC.target.darwin-arm.mk index dc7c781e..2ccc303c 100644 --- a/modules/iLBC.target.darwin-arm.mk +++ b/modules/iLBC.target.darwin-arm.mk @@ -153,6 +153,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -192,6 +193,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -275,6 +277,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -315,6 +318,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.darwin-arm64.mk b/modules/iLBC.target.darwin-arm64.mk index b5ca4fe9..467bd07b 100644 --- a/modules/iLBC.target.darwin-arm64.mk +++ b/modules/iLBC.target.darwin-arm64.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -179,6 +180,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -251,6 +253,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -288,6 +291,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.darwin-mips.mk b/modules/iLBC.target.darwin-mips.mk index c785b689..dcbcd90c 100644 --- a/modules/iLBC.target.darwin-mips.mk +++ b/modules/iLBC.target.darwin-mips.mk @@ -149,6 +149,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -187,6 +188,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -266,6 +268,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -305,6 +308,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.darwin-x86.mk b/modules/iLBC.target.darwin-x86.mk index 508eb616..f922f2e0 100644 --- a/modules/iLBC.target.darwin-x86.mk +++ b/modules/iLBC.target.darwin-x86.mk @@ -148,6 +148,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -184,6 +185,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -261,6 +263,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -298,6 +301,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.darwin-x86_64.mk b/modules/iLBC.target.darwin-x86_64.mk index 7ad9fc05..736dbbb0 100644 --- a/modules/iLBC.target.darwin-x86_64.mk +++ b/modules/iLBC.target.darwin-x86_64.mk @@ -147,6 +147,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -183,6 +184,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -259,6 +261,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -296,6 +299,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.linux-arm.mk b/modules/iLBC.target.linux-arm.mk index dc7c781e..2ccc303c 100644 --- a/modules/iLBC.target.linux-arm.mk +++ b/modules/iLBC.target.linux-arm.mk @@ -153,6 +153,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -192,6 +193,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -275,6 +277,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -315,6 +318,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.linux-arm64.mk b/modules/iLBC.target.linux-arm64.mk index b5ca4fe9..467bd07b 100644 --- a/modules/iLBC.target.linux-arm64.mk +++ b/modules/iLBC.target.linux-arm64.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -179,6 +180,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -251,6 +253,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -288,6 +291,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.linux-mips.mk b/modules/iLBC.target.linux-mips.mk index c785b689..dcbcd90c 100644 --- a/modules/iLBC.target.linux-mips.mk +++ b/modules/iLBC.target.linux-mips.mk @@ -149,6 +149,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -187,6 +188,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -266,6 +268,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -305,6 +308,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.linux-x86.mk b/modules/iLBC.target.linux-x86.mk index 508eb616..f922f2e0 100644 --- a/modules/iLBC.target.linux-x86.mk +++ b/modules/iLBC.target.linux-x86.mk @@ -148,6 +148,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -184,6 +185,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -261,6 +263,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -298,6 +301,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iLBC.target.linux-x86_64.mk b/modules/iLBC.target.linux-x86_64.mk index 7ad9fc05..736dbbb0 100644 --- a/modules/iLBC.target.linux-x86_64.mk +++ b/modules/iLBC.target.linux-x86_64.mk @@ -147,6 +147,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -183,6 +184,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -259,6 +261,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -296,6 +299,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.darwin-arm.mk b/modules/iSAC.target.darwin-arm.mk index 720042ef..fe77b995 100644 --- a/modules/iSAC.target.darwin-arm.mk +++ b/modules/iSAC.target.darwin-arm.mk @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -151,6 +152,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -234,6 +236,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -274,6 +277,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.darwin-arm64.mk b/modules/iSAC.target.darwin-arm64.mk index ce39629d..d8437101 100644 --- a/modules/iSAC.target.darwin-arm64.mk +++ b/modules/iSAC.target.darwin-arm64.mk @@ -102,6 +102,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -138,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -210,6 +212,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -247,6 +250,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.darwin-mips.mk b/modules/iSAC.target.darwin-mips.mk index 2d39671c..df0ee04f 100644 --- a/modules/iSAC.target.darwin-mips.mk +++ b/modules/iSAC.target.darwin-mips.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -146,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -225,6 +227,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -264,6 +267,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.darwin-x86.mk b/modules/iSAC.target.darwin-x86.mk index 26b9efec..d8b650c1 100644 --- a/modules/iSAC.target.darwin-x86.mk +++ b/modules/iSAC.target.darwin-x86.mk @@ -107,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -143,6 +144,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -220,6 +222,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -257,6 +260,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.darwin-x86_64.mk b/modules/iSAC.target.darwin-x86_64.mk index 9d164ff3..7e2d669e 100644 --- a/modules/iSAC.target.darwin-x86_64.mk +++ b/modules/iSAC.target.darwin-x86_64.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -142,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.linux-arm.mk b/modules/iSAC.target.linux-arm.mk index 720042ef..fe77b995 100644 --- a/modules/iSAC.target.linux-arm.mk +++ b/modules/iSAC.target.linux-arm.mk @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -151,6 +152,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -234,6 +236,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -274,6 +277,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.linux-arm64.mk b/modules/iSAC.target.linux-arm64.mk index ce39629d..d8437101 100644 --- a/modules/iSAC.target.linux-arm64.mk +++ b/modules/iSAC.target.linux-arm64.mk @@ -102,6 +102,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -138,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -210,6 +212,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -247,6 +250,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.linux-mips.mk b/modules/iSAC.target.linux-mips.mk index 2d39671c..df0ee04f 100644 --- a/modules/iSAC.target.linux-mips.mk +++ b/modules/iSAC.target.linux-mips.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -146,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -225,6 +227,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -264,6 +267,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.linux-x86.mk b/modules/iSAC.target.linux-x86.mk index 26b9efec..d8b650c1 100644 --- a/modules/iSAC.target.linux-x86.mk +++ b/modules/iSAC.target.linux-x86.mk @@ -107,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -143,6 +144,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -220,6 +222,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -257,6 +260,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSAC.target.linux-x86_64.mk b/modules/iSAC.target.linux-x86_64.mk index 9d164ff3..7e2d669e 100644 --- a/modules/iSAC.target.linux-x86_64.mk +++ b/modules/iSAC.target.linux-x86_64.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -142,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.darwin-arm.mk b/modules/iSACFix.target.darwin-arm.mk index e8c3a9e4..55aebcf0 100644 --- a/modules/iSACFix.target.darwin-arm.mk +++ b/modules/iSACFix.target.darwin-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.darwin-arm64.mk b/modules/iSACFix.target.darwin-arm64.mk index 302a797a..d94f4bb5 100644 --- a/modules/iSACFix.target.darwin-arm64.mk +++ b/modules/iSACFix.target.darwin-arm64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -136,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -246,6 +249,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.darwin-mips.mk b/modules/iSACFix.target.darwin-mips.mk index 026c4be9..923ac1a4 100644 --- a/modules/iSACFix.target.darwin-mips.mk +++ b/modules/iSACFix.target.darwin-mips.mk @@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c \ - third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c \ @@ -48,7 +47,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c \ - third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c + third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c \ + third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_mips.c \ + third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c # Flags passed to both C and C++ files. @@ -106,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +227,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +267,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.darwin-x86.mk b/modules/iSACFix.target.darwin-x86.mk index f2ca7372..ba4eb356 100644 --- a/modules/iSACFix.target.darwin-x86.mk +++ b/modules/iSACFix.target.darwin-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -141,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -256,6 +259,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.darwin-x86_64.mk b/modules/iSACFix.target.darwin-x86_64.mk index 82044b8b..bca3061a 100644 --- a/modules/iSACFix.target.darwin-x86_64.mk +++ b/modules/iSACFix.target.darwin-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -140,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +257,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.linux-arm.mk b/modules/iSACFix.target.linux-arm.mk index e8c3a9e4..55aebcf0 100644 --- a/modules/iSACFix.target.linux-arm.mk +++ b/modules/iSACFix.target.linux-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.linux-arm64.mk b/modules/iSACFix.target.linux-arm64.mk index 302a797a..d94f4bb5 100644 --- a/modules/iSACFix.target.linux-arm64.mk +++ b/modules/iSACFix.target.linux-arm64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -136,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -246,6 +249,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.linux-mips.mk b/modules/iSACFix.target.linux-mips.mk index 026c4be9..923ac1a4 100644 --- a/modules/iSACFix.target.linux-mips.mk +++ b/modules/iSACFix.target.linux-mips.mk @@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c \ - third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c \ @@ -48,7 +47,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c \ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c \ - third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c + third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c \ + third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_mips.c \ + third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c # Flags passed to both C and C++ files. @@ -106,6 +107,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +227,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +267,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.linux-x86.mk b/modules/iSACFix.target.linux-x86.mk index f2ca7372..ba4eb356 100644 --- a/modules/iSACFix.target.linux-x86.mk +++ b/modules/iSACFix.target.linux-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -141,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -256,6 +259,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/iSACFix.target.linux-x86_64.mk b/modules/iSACFix.target.linux-x86_64.mk index 82044b8b..bca3061a 100644 --- a/modules/iSACFix.target.linux-x86_64.mk +++ b/modules/iSACFix.target.linux-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -140,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +257,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/isac_neon.target.darwin-arm.mk b/modules/isac_neon.target.darwin-arm.mk index de60236a..56b3568b 100644 --- a/modules/isac_neon.target.darwin-arm.mk +++ b/modules/isac_neon.target.darwin-arm.mk @@ -92,6 +92,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -131,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -215,6 +217,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/isac_neon.target.linux-arm.mk b/modules/isac_neon.target.linux-arm.mk index de60236a..56b3568b 100644 --- a/modules/isac_neon.target.linux-arm.mk +++ b/modules/isac_neon.target.linux-arm.mk @@ -92,6 +92,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -131,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -215,6 +217,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.darwin-arm.mk b/modules/media_file.target.darwin-arm.mk index 3432db99..4ee56c23 100644 --- a/modules/media_file.target.darwin-arm.mk +++ b/modules/media_file.target.darwin-arm.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -127,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -208,6 +210,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.darwin-arm64.mk b/modules/media_file.target.darwin-arm64.mk index 24afd3f5..0008a3ce 100644 --- a/modules/media_file.target.darwin-arm64.mk +++ b/modules/media_file.target.darwin-arm64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -221,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.darwin-mips.mk b/modules/media_file.target.darwin-mips.mk index 7c89b5e0..1ada8f80 100644 --- a/modules/media_file.target.darwin-mips.mk +++ b/modules/media_file.target.darwin-mips.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -122,6 +123,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -199,6 +201,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -238,6 +241,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.darwin-x86.mk b/modules/media_file.target.darwin-x86.mk index 3404a501..a9938288 100644 --- a/modules/media_file.target.darwin-x86.mk +++ b/modules/media_file.target.darwin-x86.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.darwin-x86_64.mk b/modules/media_file.target.darwin-x86_64.mk index 6eed4fc6..73cc56a5 100644 --- a/modules/media_file.target.darwin-x86_64.mk +++ b/modules/media_file.target.darwin-x86_64.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.linux-arm.mk b/modules/media_file.target.linux-arm.mk index 3432db99..4ee56c23 100644 --- a/modules/media_file.target.linux-arm.mk +++ b/modules/media_file.target.linux-arm.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -127,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -208,6 +210,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.linux-arm64.mk b/modules/media_file.target.linux-arm64.mk index 24afd3f5..0008a3ce 100644 --- a/modules/media_file.target.linux-arm64.mk +++ b/modules/media_file.target.linux-arm64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -221,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.linux-mips.mk b/modules/media_file.target.linux-mips.mk index 7c89b5e0..1ada8f80 100644 --- a/modules/media_file.target.linux-mips.mk +++ b/modules/media_file.target.linux-mips.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -122,6 +123,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -199,6 +201,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -238,6 +241,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.linux-x86.mk b/modules/media_file.target.linux-x86.mk index 3404a501..a9938288 100644 --- a/modules/media_file.target.linux-x86.mk +++ b/modules/media_file.target.linux-x86.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/media_file.target.linux-x86_64.mk b/modules/media_file.target.linux-x86_64.mk index 6eed4fc6..73cc56a5 100644 --- a/modules/media_file.target.linux-x86_64.mk +++ b/modules/media_file.target.linux-x86_64.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/modules.gyp b/modules/modules.gyp index 701ee770..8dec125b 100644 --- a/modules/modules.gyp +++ b/modules/modules.gyp @@ -17,7 +17,7 @@ 'audio_coding/codecs/isac/fix/source/isacfix.gypi', 'audio_coding/codecs/pcm16b/pcm16b.gypi', 'audio_coding/main/acm2/audio_coding_module.gypi', - 'audio_coding/neteq4/neteq.gypi', + 'audio_coding/neteq/neteq.gypi', 'audio_conference_mixer/source/audio_conference_mixer.gypi', 'audio_device/audio_device.gypi', 'audio_processing/audio_processing.gypi', @@ -75,8 +75,8 @@ 'desktop_capture', 'iSACFix', 'media_file', - 'NetEq4', - 'NetEq4TestTools', + 'neteq', + 'neteq_test_tools', 'neteq_unittest_tools', 'paced_sender', 'PCM16B', # Needed by NetEq tests. @@ -112,45 +112,45 @@ 'audio_coding/codecs/isac/fix/source/transform_unittest.cc', 'audio_coding/codecs/isac/main/source/isac_unittest.cc', 'audio_coding/codecs/opus/opus_unittest.cc', - 'audio_coding/neteq4/audio_classifier_unittest.cc', - 'audio_coding/neteq4/audio_multi_vector_unittest.cc', - 'audio_coding/neteq4/audio_vector_unittest.cc', - 'audio_coding/neteq4/background_noise_unittest.cc', - 'audio_coding/neteq4/buffer_level_filter_unittest.cc', - 'audio_coding/neteq4/comfort_noise_unittest.cc', - 'audio_coding/neteq4/decision_logic_unittest.cc', - 'audio_coding/neteq4/decoder_database_unittest.cc', - 'audio_coding/neteq4/delay_manager_unittest.cc', - 'audio_coding/neteq4/delay_peak_detector_unittest.cc', - 'audio_coding/neteq4/dsp_helper_unittest.cc', - 'audio_coding/neteq4/dtmf_buffer_unittest.cc', - 'audio_coding/neteq4/dtmf_tone_generator_unittest.cc', - 'audio_coding/neteq4/expand_unittest.cc', - 'audio_coding/neteq4/merge_unittest.cc', - 'audio_coding/neteq4/neteq_external_decoder_unittest.cc', - 'audio_coding/neteq4/neteq_impl_unittest.cc', - 'audio_coding/neteq4/neteq_stereo_unittest.cc', - 'audio_coding/neteq4/neteq_unittest.cc', - 'audio_coding/neteq4/normal_unittest.cc', - 'audio_coding/neteq4/packet_buffer_unittest.cc', - 'audio_coding/neteq4/payload_splitter_unittest.cc', - 'audio_coding/neteq4/post_decode_vad_unittest.cc', - 'audio_coding/neteq4/random_vector_unittest.cc', - 'audio_coding/neteq4/sync_buffer_unittest.cc', - 'audio_coding/neteq4/timestamp_scaler_unittest.cc', - 'audio_coding/neteq4/time_stretch_unittest.cc', - 'audio_coding/neteq4/mock/mock_audio_decoder.h', - 'audio_coding/neteq4/mock/mock_audio_vector.h', - 'audio_coding/neteq4/mock/mock_buffer_level_filter.h', - 'audio_coding/neteq4/mock/mock_decoder_database.h', - 'audio_coding/neteq4/mock/mock_delay_manager.h', - 'audio_coding/neteq4/mock/mock_delay_peak_detector.h', - 'audio_coding/neteq4/mock/mock_dtmf_buffer.h', - 'audio_coding/neteq4/mock/mock_dtmf_tone_generator.h', - 'audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h', - 'audio_coding/neteq4/mock/mock_packet_buffer.h', - 'audio_coding/neteq4/mock/mock_payload_splitter.h', - 'audio_coding/neteq4/tools/packet_unittest.cc', + 'audio_coding/neteq/audio_classifier_unittest.cc', + 'audio_coding/neteq/audio_multi_vector_unittest.cc', + 'audio_coding/neteq/audio_vector_unittest.cc', + 'audio_coding/neteq/background_noise_unittest.cc', + 'audio_coding/neteq/buffer_level_filter_unittest.cc', + 'audio_coding/neteq/comfort_noise_unittest.cc', + 'audio_coding/neteq/decision_logic_unittest.cc', + 'audio_coding/neteq/decoder_database_unittest.cc', + 'audio_coding/neteq/delay_manager_unittest.cc', + 'audio_coding/neteq/delay_peak_detector_unittest.cc', + 'audio_coding/neteq/dsp_helper_unittest.cc', + 'audio_coding/neteq/dtmf_buffer_unittest.cc', + 'audio_coding/neteq/dtmf_tone_generator_unittest.cc', + 'audio_coding/neteq/expand_unittest.cc', + 'audio_coding/neteq/merge_unittest.cc', + 'audio_coding/neteq/neteq_external_decoder_unittest.cc', + 'audio_coding/neteq/neteq_impl_unittest.cc', + 'audio_coding/neteq/neteq_stereo_unittest.cc', + 'audio_coding/neteq/neteq_unittest.cc', + 'audio_coding/neteq/normal_unittest.cc', + 'audio_coding/neteq/packet_buffer_unittest.cc', + 'audio_coding/neteq/payload_splitter_unittest.cc', + 'audio_coding/neteq/post_decode_vad_unittest.cc', + 'audio_coding/neteq/random_vector_unittest.cc', + 'audio_coding/neteq/sync_buffer_unittest.cc', + 'audio_coding/neteq/timestamp_scaler_unittest.cc', + 'audio_coding/neteq/time_stretch_unittest.cc', + 'audio_coding/neteq/mock/mock_audio_decoder.h', + 'audio_coding/neteq/mock/mock_audio_vector.h', + 'audio_coding/neteq/mock/mock_buffer_level_filter.h', + 'audio_coding/neteq/mock/mock_decoder_database.h', + 'audio_coding/neteq/mock/mock_delay_manager.h', + 'audio_coding/neteq/mock/mock_delay_peak_detector.h', + 'audio_coding/neteq/mock/mock_dtmf_buffer.h', + 'audio_coding/neteq/mock/mock_dtmf_tone_generator.h', + 'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h', + 'audio_coding/neteq/mock/mock_packet_buffer.h', + 'audio_coding/neteq/mock/mock_payload_splitter.h', + 'audio_coding/neteq/tools/packet_unittest.cc', 'audio_processing/aec/system_delay_unittest.cc', 'audio_processing/aec/echo_cancellation_unittest.cc', 'audio_processing/echo_cancellation_impl_unittest.cc', diff --git a/modules/modules_tests.isolate b/modules/modules_tests.isolate index 7a051f66..e5055f0d 100644 --- a/modules/modules_tests.isolate +++ b/modules/modules_tests.isolate @@ -8,32 +8,30 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../DEPS', - '../../resources/audio_coding/testfile32kHz.pcm', - '../../resources/audio_coding/teststereo32kHz.pcm', - '../../resources/foreman_cif.yuv', - '../../resources/paris_qcif.yuv', - '../../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', + '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm', + '<(DEPTH)/resources/foreman_cif.yuv', + '<(DEPTH)/resources/paris_qcif.yuv', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate index 74b713f6..09ace1c1 100644 --- a/modules/modules_unittests.isolate +++ b/modules/modules_unittests.isolate @@ -8,107 +8,105 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], 'isolate_dependency_tracked': [ - '../../../resources/short_mixed_mono_48.dat', - '../../../resources/short_mixed_mono_48.pcm', - '../../../resources/short_mixed_stereo_48.dat', - '../../../resources/short_mixed_stereo_48.pcm', + '<(DEPTH)/resources/short_mixed_mono_48.dat', + '<(DEPTH)/resources/short_mixed_mono_48.pcm', + '<(DEPTH)/resources/short_mixed_stereo_48.dat', + '<(DEPTH)/resources/short_mixed_stereo_48.pcm', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../DEPS', - '../../data/audio_processing/output_data_float.pb', - '../../data/voice_engine/audio_tiny48.wav', - '../../resources/att-downlink.rx', - '../../resources/att-uplink.rx', - '../../resources/audio_coding/neteq4_network_stats.dat', - '../../resources/audio_coding/neteq4_rtcp_stats.dat', - '../../resources/audio_coding/neteq4_universal_ref.pcm', - '../../resources/audio_coding/neteq4_universal_ref_win_32.pcm', - '../../resources/audio_coding/neteq4_universal_ref_win_64.pcm', - '../../resources/audio_coding/neteq_network_stats.dat', - '../../resources/audio_coding/neteq_rtcp_stats.dat', - '../../resources/audio_coding/neteq_universal_new.rtp', - '../../resources/audio_coding/neteq_universal_ref.pcm', - '../../resources/audio_coding/testfile32kHz.pcm', - '../../resources/deflicker_before_cif_short.yuv', - '../../resources/far16_stereo.pcm', - '../../resources/far32_stereo.pcm', - '../../resources/far44_stereo.pcm', - '../../resources/far48_stereo.pcm', - '../../resources/far8_stereo.pcm', - '../../resources/foremanColorEnhanced_cif_short.yuv', - '../../resources/foreman_cif.yuv', - '../../resources/foreman_cif_short.yuv', - '../../resources/near16_stereo.pcm', - '../../resources/near32_stereo.pcm', - '../../resources/near44_stereo.pcm', - '../../resources/near48_stereo.pcm', - '../../resources/near8_stereo.pcm', - '../../resources/ref03.aecdump', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin', - '../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin', - '../../resources/short_mixed_mono_48.dat', - '../../resources/short_mixed_mono_48.pcm', - '../../resources/short_mixed_stereo_48.dat', - '../../resources/short_mixed_stereo_48.pcm', - '../../resources/sprint-downlink.rx', - '../../resources/sprint-uplink.rx', - '../../resources/synthetic-trace.rx', - '../../resources/tmobile-downlink.rx', - '../../resources/tmobile-uplink.rx', - '../../resources/utility/encapsulated_pcm16b_8khz.wav', - '../../resources/utility/encapsulated_pcmu_8khz.wav', - '../../resources/verizon3g-downlink.rx', - '../../resources/verizon3g-uplink.rx', - '../../resources/verizon4g-downlink.rx', - '../../resources/verizon4g-uplink.rx', - '../../resources/video_coding/frame-ethernet-ii.pcap', - '../../resources/video_coding/frame-loopback.pcap', - '../../resources/video_coding/pltype103.rtp', - '../../resources/video_coding/ssrcs-2.pcap', - '../../resources/video_coding/ssrcs-3.pcap', - '../../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/data/audio_processing/output_data_float.pb', + '<(DEPTH)/data/voice_engine/audio_tiny48.wav', + '<(DEPTH)/resources/att-downlink.rx', + '<(DEPTH)/resources/att-uplink.rx', + '<(DEPTH)/resources/audio_coding/neteq4_network_stats.dat', + '<(DEPTH)/resources/audio_coding/neteq4_rtcp_stats.dat', + '<(DEPTH)/resources/audio_coding/neteq4_universal_ref.pcm', + '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_32.pcm', + '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_64.pcm', + '<(DEPTH)/resources/audio_coding/neteq_network_stats.dat', + '<(DEPTH)/resources/audio_coding/neteq_rtcp_stats.dat', + '<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp', + '<(DEPTH)/resources/audio_coding/neteq_universal_ref.pcm', + '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', + '<(DEPTH)/resources/deflicker_before_cif_short.yuv', + '<(DEPTH)/resources/far16_stereo.pcm', + '<(DEPTH)/resources/far32_stereo.pcm', + '<(DEPTH)/resources/far44_stereo.pcm', + '<(DEPTH)/resources/far48_stereo.pcm', + '<(DEPTH)/resources/far8_stereo.pcm', + '<(DEPTH)/resources/foremanColorEnhanced_cif_short.yuv', + '<(DEPTH)/resources/foreman_cif.yuv', + '<(DEPTH)/resources/foreman_cif_short.yuv', + '<(DEPTH)/resources/near16_stereo.pcm', + '<(DEPTH)/resources/near32_stereo.pcm', + '<(DEPTH)/resources/near44_stereo.pcm', + '<(DEPTH)/resources/near48_stereo.pcm', + '<(DEPTH)/resources/near8_stereo.pcm', + '<(DEPTH)/resources/ref03.aecdump', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin', + '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin', + '<(DEPTH)/resources/short_mixed_mono_48.dat', + '<(DEPTH)/resources/short_mixed_mono_48.pcm', + '<(DEPTH)/resources/short_mixed_stereo_48.dat', + '<(DEPTH)/resources/short_mixed_stereo_48.pcm', + '<(DEPTH)/resources/sprint-downlink.rx', + '<(DEPTH)/resources/sprint-uplink.rx', + '<(DEPTH)/resources/synthetic-trace.rx', + '<(DEPTH)/resources/tmobile-downlink.rx', + '<(DEPTH)/resources/tmobile-uplink.rx', + '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav', + '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav', + '<(DEPTH)/resources/verizon3g-downlink.rx', + '<(DEPTH)/resources/verizon3g-uplink.rx', + '<(DEPTH)/resources/verizon4g-downlink.rx', + '<(DEPTH)/resources/verizon4g-uplink.rx', + '<(DEPTH)/resources/video_coding/frame-ethernet-ii.pcap', + '<(DEPTH)/resources/video_coding/frame-loopback.pcap', + '<(DEPTH)/resources/video_coding/pltype103.rtp', + '<(DEPTH)/resources/video_coding/ssrcs-2.pcap', + '<(DEPTH)/resources/video_coding/ssrcs-3.pcap', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/modules/NetEq4.target.linux-arm.mk b/modules/neteq.target.darwin-arm.mk index 47d15e8f..5735810a 100644 --- a/modules/NetEq4.target.linux-arm.mk +++ b/modules/neteq.target.darwin-arm.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -158,6 +159,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -251,6 +253,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -292,6 +295,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -382,10 +386,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.darwin-arm64.mk b/modules/neteq.target.darwin-arm64.mk index 5904e670..4e247a80 100644 --- a/modules/NetEq4.target.darwin-arm64.mk +++ b/modules/neteq.target.darwin-arm64.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -227,6 +229,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -265,6 +268,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -346,10 +350,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.linux-mips.mk b/modules/neteq.target.darwin-mips.mk index a03c99c0..124c5326 100644 --- a/modules/NetEq4.target.linux-mips.mk +++ b/modules/neteq.target.darwin-mips.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -153,6 +154,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -242,6 +244,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -282,6 +285,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -368,10 +372,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.darwin-x86.mk b/modules/neteq.target.darwin-x86.mk index 5a73327a..4f8c2ddc 100644 --- a/modules/NetEq4.target.darwin-x86.mk +++ b/modules/neteq.target.darwin-x86.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -150,6 +151,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -237,6 +239,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -275,6 +278,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -360,10 +364,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.darwin-x86_64.mk b/modules/neteq.target.darwin-x86_64.mk index f74127a9..6d3cf52d 100644 --- a/modules/NetEq4.target.darwin-x86_64.mk +++ b/modules/neteq.target.darwin-x86_64.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -235,6 +237,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -358,10 +362,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.darwin-arm.mk b/modules/neteq.target.linux-arm.mk index 47d15e8f..5735810a 100644 --- a/modules/NetEq4.target.darwin-arm.mk +++ b/modules/neteq.target.linux-arm.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -158,6 +159,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -251,6 +253,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -292,6 +295,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -382,10 +386,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.linux-arm64.mk b/modules/neteq.target.linux-arm64.mk index 5904e670..4e247a80 100644 --- a/modules/NetEq4.target.linux-arm64.mk +++ b/modules/neteq.target.linux-arm64.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -227,6 +229,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -265,6 +268,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -346,10 +350,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.darwin-mips.mk b/modules/neteq.target.linux-mips.mk index a03c99c0..124c5326 100644 --- a/modules/NetEq4.target.darwin-mips.mk +++ b/modules/neteq.target.linux-mips.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -153,6 +154,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -242,6 +244,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -282,6 +285,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -368,10 +372,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.linux-x86.mk b/modules/neteq.target.linux-x86.mk index 5a73327a..4f8c2ddc 100644 --- a/modules/NetEq4.target.linux-x86.mk +++ b/modules/neteq.target.linux-x86.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -150,6 +151,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -237,6 +239,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -275,6 +278,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -360,10 +364,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/NetEq4.target.linux-x86_64.mk b/modules/neteq.target.linux-x86_64.mk index f74127a9..6d3cf52d 100644 --- a/modules/NetEq4.target.linux-x86_64.mk +++ b/modules/neteq.target.linux-x86_64.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp +LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -24,39 +24,39 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \ - third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/merge.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \ - third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \ - third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \ - third_party/webrtc/modules/audio_coding/neteq4/normal.cc \ - third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \ - third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \ - third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \ - third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \ - third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \ - third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \ - third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \ - third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc + third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \ + third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \ + third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \ + third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \ + third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \ + third_party/webrtc/modules/audio_coding/neteq/expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/merge.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \ + third_party/webrtc/modules/audio_coding/neteq/neteq.cc \ + third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \ + third_party/webrtc/modules/audio_coding/neteq/normal.cc \ + third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \ + third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \ + third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \ + third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \ + third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \ + third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \ + third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \ + third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc # Flags passed to both C and C++ files. @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -235,6 +237,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -358,10 +362,10 @@ LOCAL_SHARED_LIBRARIES := \ # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp +gyp_all_modules: third_party_webrtc_modules_neteq_gyp # Alias gyp target name. -.PHONY: NetEq4 -NetEq4: third_party_webrtc_modules_NetEq4_gyp +.PHONY: neteq +neteq: third_party_webrtc_modules_neteq_gyp include $(BUILD_STATIC_LIBRARY) diff --git a/modules/paced_sender.target.darwin-arm.mk b/modules/paced_sender.target.darwin-arm.mk index c84e2dd3..113cff0e 100644 --- a/modules/paced_sender.target.darwin-arm.mk +++ b/modules/paced_sender.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.darwin-arm64.mk b/modules/paced_sender.target.darwin-arm64.mk index 4750f694..aff94313 100644 --- a/modules/paced_sender.target.darwin-arm64.mk +++ b/modules/paced_sender.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.darwin-mips.mk b/modules/paced_sender.target.darwin-mips.mk index 7a09c1b6..c0bdb720 100644 --- a/modules/paced_sender.target.darwin-mips.mk +++ b/modules/paced_sender.target.darwin-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.darwin-x86.mk b/modules/paced_sender.target.darwin-x86.mk index 7ab0a6ef..dbd81ae3 100644 --- a/modules/paced_sender.target.darwin-x86.mk +++ b/modules/paced_sender.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.darwin-x86_64.mk b/modules/paced_sender.target.darwin-x86_64.mk index 52480e3c..29b232c4 100644 --- a/modules/paced_sender.target.darwin-x86_64.mk +++ b/modules/paced_sender.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.linux-arm.mk b/modules/paced_sender.target.linux-arm.mk index c84e2dd3..113cff0e 100644 --- a/modules/paced_sender.target.linux-arm.mk +++ b/modules/paced_sender.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.linux-arm64.mk b/modules/paced_sender.target.linux-arm64.mk index 4750f694..aff94313 100644 --- a/modules/paced_sender.target.linux-arm64.mk +++ b/modules/paced_sender.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.linux-mips.mk b/modules/paced_sender.target.linux-mips.mk index 7a09c1b6..c0bdb720 100644 --- a/modules/paced_sender.target.linux-mips.mk +++ b/modules/paced_sender.target.linux-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.linux-x86.mk b/modules/paced_sender.target.linux-x86.mk index 7ab0a6ef..dbd81ae3 100644 --- a/modules/paced_sender.target.linux-x86.mk +++ b/modules/paced_sender.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/paced_sender.target.linux-x86_64.mk b/modules/paced_sender.target.linux-x86_64.mk index 52480e3c..29b232c4 100644 --- a/modules/paced_sender.target.linux-x86_64.mk +++ b/modules/paced_sender.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index 125d3c0c..e9f9bddc 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -124,7 +124,7 @@ PacedSender::PacedSender(Callback* callback, int max_bitrate_kbps, int min_bitrate_kbps) : callback_(callback), - enabled_(false), + enabled_(true), paused_(false), max_queue_length_ms_(kDefaultMaxQueueLengthMs), critsect_(CriticalSectionWrapper::CreateCriticalSection()), diff --git a/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc index 435c93c5..9763c800 100644 --- a/modules/pacing/paced_sender_unittest.cc +++ b/modules/pacing/paced_sender_unittest.cc @@ -61,7 +61,6 @@ class PacedSenderTest : public ::testing::Test { // Need to initialize PacedSender after we initialize clock. send_bucket_.reset( new PacedSender(&callback_, kPaceMultiplier * kTargetBitrate, 0)); - send_bucket_->SetStatus(true); } void SendAndExpectPacket(PacedSender::Priority priority, @@ -276,7 +275,6 @@ TEST_F(PacedSenderTest, VerifyAverageBitrateVaryingMediaPayload) { PacedSenderPadding callback; send_bucket_.reset( new PacedSender(&callback, kPaceMultiplier * kTargetBitrate, 0)); - send_bucket_->SetStatus(true); send_bucket_->UpdateBitrate(kPaceMultiplier * kTargetBitrate, kTargetBitrate); int64_t start_time = TickTime::MillisecondTimestamp(); int media_bytes = 0; diff --git a/modules/remote_bitrate_estimator.target.darwin-arm.mk b/modules/remote_bitrate_estimator.target.darwin-arm.mk index a4a7a478..e531eb07 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.darwin-arm64.mk b/modules/remote_bitrate_estimator.target.darwin-arm64.mk index 5b7847ff..ff731d5c 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm64.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.darwin-mips.mk b/modules/remote_bitrate_estimator.target.darwin-mips.mk index 70995a12..4f247a9d 100644 --- a/modules/remote_bitrate_estimator.target.darwin-mips.mk +++ b/modules/remote_bitrate_estimator.target.darwin-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.darwin-x86.mk b/modules/remote_bitrate_estimator.target.darwin-x86.mk index 24519158..0c146943 100644 --- a/modules/remote_bitrate_estimator.target.darwin-x86.mk +++ b/modules/remote_bitrate_estimator.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.darwin-x86_64.mk b/modules/remote_bitrate_estimator.target.darwin-x86_64.mk index abd87f1e..b5fb9ea6 100644 --- a/modules/remote_bitrate_estimator.target.darwin-x86_64.mk +++ b/modules/remote_bitrate_estimator.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.linux-arm.mk b/modules/remote_bitrate_estimator.target.linux-arm.mk index a4a7a478..e531eb07 100644 --- a/modules/remote_bitrate_estimator.target.linux-arm.mk +++ b/modules/remote_bitrate_estimator.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.linux-arm64.mk b/modules/remote_bitrate_estimator.target.linux-arm64.mk index 5b7847ff..ff731d5c 100644 --- a/modules/remote_bitrate_estimator.target.linux-arm64.mk +++ b/modules/remote_bitrate_estimator.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.linux-mips.mk b/modules/remote_bitrate_estimator.target.linux-mips.mk index 70995a12..4f247a9d 100644 --- a/modules/remote_bitrate_estimator.target.linux-mips.mk +++ b/modules/remote_bitrate_estimator.target.linux-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.linux-x86.mk b/modules/remote_bitrate_estimator.target.linux-x86.mk index 24519158..0c146943 100644 --- a/modules/remote_bitrate_estimator.target.linux-x86.mk +++ b/modules/remote_bitrate_estimator.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator.target.linux-x86_64.mk b/modules/remote_bitrate_estimator.target.linux-x86_64.mk index abd87f1e..b5fb9ea6 100644 --- a/modules/remote_bitrate_estimator.target.linux-x86_64.mk +++ b/modules/remote_bitrate_estimator.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk index 8cc1fe59..7ef87389 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -197,6 +199,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -237,6 +240,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk index d79856f1..62cfecaf 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk @@ -74,6 +74,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -110,6 +111,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -173,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -210,6 +213,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk index ecf87763..5aa92d00 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -186,6 +188,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk index 5716039a..991bf15b 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -183,6 +185,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -220,6 +223,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk index cdcab772..482c136e 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk index 8cc1fe59..7ef87389 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -197,6 +199,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -237,6 +240,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk index d79856f1..62cfecaf 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk @@ -74,6 +74,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -110,6 +111,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -173,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -210,6 +213,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk index ecf87763..5aa92d00 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -186,6 +188,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk index 5716039a..991bf15b 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -183,6 +185,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -220,6 +223,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk index cdcab772..482c136e 100644 --- a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk +++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.darwin-arm.mk b/modules/rtp_rtcp.target.darwin-arm.mk index f8fa447f..67a9e406 100644 --- a/modules/rtp_rtcp.target.darwin-arm.mk +++ b/modules/rtp_rtcp.target.darwin-arm.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -154,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.darwin-arm64.mk b/modules/rtp_rtcp.target.darwin-arm64.mk index e185a07e..0f1f3116 100644 --- a/modules/rtp_rtcp.target.darwin-arm64.mk +++ b/modules/rtp_rtcp.target.darwin-arm64.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -141,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -246,6 +249,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.darwin-mips.mk b/modules/rtp_rtcp.target.darwin-mips.mk index aab511c3..5d87d71a 100644 --- a/modules/rtp_rtcp.target.darwin-mips.mk +++ b/modules/rtp_rtcp.target.darwin-mips.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +226,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.darwin-x86.mk b/modules/rtp_rtcp.target.darwin-x86.mk index 45ee736e..fadd4664 100644 --- a/modules/rtp_rtcp.target.darwin-x86.mk +++ b/modules/rtp_rtcp.target.darwin-x86.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -146,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -256,6 +259,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.darwin-x86_64.mk b/modules/rtp_rtcp.target.darwin-x86_64.mk index 04668f63..dc3ad83e 100644 --- a/modules/rtp_rtcp.target.darwin-x86_64.mk +++ b/modules/rtp_rtcp.target.darwin-x86_64.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +257,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.linux-arm.mk b/modules/rtp_rtcp.target.linux-arm.mk index f8fa447f..67a9e406 100644 --- a/modules/rtp_rtcp.target.linux-arm.mk +++ b/modules/rtp_rtcp.target.linux-arm.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -154,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -273,6 +276,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.linux-arm64.mk b/modules/rtp_rtcp.target.linux-arm64.mk index e185a07e..0f1f3116 100644 --- a/modules/rtp_rtcp.target.linux-arm64.mk +++ b/modules/rtp_rtcp.target.linux-arm64.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -141,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -246,6 +249,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.linux-mips.mk b/modules/rtp_rtcp.target.linux-mips.mk index aab511c3..5d87d71a 100644 --- a/modules/rtp_rtcp.target.linux-mips.mk +++ b/modules/rtp_rtcp.target.linux-mips.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -224,6 +226,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -263,6 +266,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.linux-x86.mk b/modules/rtp_rtcp.target.linux-x86.mk index 45ee736e..fadd4664 100644 --- a/modules/rtp_rtcp.target.linux-x86.mk +++ b/modules/rtp_rtcp.target.linux-x86.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -146,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -256,6 +259,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp.target.linux-x86_64.mk b/modules/rtp_rtcp.target.linux-x86_64.mk index 04668f63..dc3ad83e 100644 --- a/modules/rtp_rtcp.target.linux-x86_64.mk +++ b/modules/rtp_rtcp.target.linux-x86_64.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -145,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +257,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/rtp_rtcp/source/rtcp_packet.cc b/modules/rtp_rtcp/source/rtcp_packet.cc index 51c86aaa..a4cdfd95 100644 --- a/modules/rtp_rtcp/source/rtcp_packet.cc +++ b/modules/rtp_rtcp/source/rtcp_packet.cc @@ -13,21 +13,39 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/system_wrappers/interface/logging.h" +using webrtc::RTCPUtility::PT_APP; using webrtc::RTCPUtility::PT_BYE; +using webrtc::RTCPUtility::PT_IJ; using webrtc::RTCPUtility::PT_PSFB; using webrtc::RTCPUtility::PT_RR; using webrtc::RTCPUtility::PT_RTPFB; +using webrtc::RTCPUtility::PT_SDES; using webrtc::RTCPUtility::PT_SR; +using webrtc::RTCPUtility::PT_XR; +using webrtc::RTCPUtility::RTCPPacketAPP; using webrtc::RTCPUtility::RTCPPacketBYE; +using webrtc::RTCPUtility::RTCPPacketPSFBAPP; using webrtc::RTCPUtility::RTCPPacketPSFBFIR; using webrtc::RTCPUtility::RTCPPacketPSFBFIRItem; +using webrtc::RTCPUtility::RTCPPacketPSFBPLI; +using webrtc::RTCPUtility::RTCPPacketPSFBREMBItem; using webrtc::RTCPUtility::RTCPPacketPSFBRPSI; +using webrtc::RTCPUtility::RTCPPacketPSFBSLI; +using webrtc::RTCPUtility::RTCPPacketPSFBSLIItem; using webrtc::RTCPUtility::RTCPPacketReportBlockItem; using webrtc::RTCPUtility::RTCPPacketRR; using webrtc::RTCPUtility::RTCPPacketRTPFBNACK; using webrtc::RTCPUtility::RTCPPacketRTPFBNACKItem; +using webrtc::RTCPUtility::RTCPPacketRTPFBTMMBN; +using webrtc::RTCPUtility::RTCPPacketRTPFBTMMBNItem; +using webrtc::RTCPUtility::RTCPPacketRTPFBTMMBR; +using webrtc::RTCPUtility::RTCPPacketRTPFBTMMBRItem; using webrtc::RTCPUtility::RTCPPacketSR; +using webrtc::RTCPUtility::RTCPPacketXRDLRRReportBlockItem; +using webrtc::RTCPUtility::RTCPPacketXRReceiverReferenceTimeItem; +using webrtc::RTCPUtility::RTCPPacketXR; +using webrtc::RTCPUtility::RTCPPacketXRVOIPMetricItem; namespace webrtc { namespace rtcp { @@ -35,23 +53,23 @@ namespace { // Unused SSRC of media source, set to 0. const uint32_t kUnusedMediaSourceSsrc0 = 0; -void AssignUWord8(uint8_t* buffer, uint16_t* offset, uint8_t value) { +void AssignUWord8(uint8_t* buffer, size_t* offset, uint8_t value) { buffer[(*offset)++] = value; } -void AssignUWord16(uint8_t* buffer, uint16_t* offset, uint16_t value) { +void AssignUWord16(uint8_t* buffer, size_t* offset, uint16_t value) { ModuleRTPUtility::AssignUWord16ToBuffer(buffer + *offset, value); *offset += 2; } -void AssignUWord24(uint8_t* buffer, uint16_t* offset, uint32_t value) { +void AssignUWord24(uint8_t* buffer, size_t* offset, uint32_t value) { ModuleRTPUtility::AssignUWord24ToBuffer(buffer + *offset, value); *offset += 3; } -void AssignUWord32(uint8_t* buffer, uint16_t* offset, uint32_t value) { +void AssignUWord32(uint8_t* buffer, size_t* offset, uint32_t value) { ModuleRTPUtility::AssignUWord32ToBuffer(buffer + *offset, value); *offset += 4; } -uint16_t BlockToHeaderLength(uint16_t length_in_bytes) { +size_t BlockToHeaderLength(size_t length_in_bytes) { // Length in 32-bit words minus 1. assert(length_in_bytes > 0); assert(length_in_bytes % 4 == 0); @@ -69,9 +87,10 @@ uint16_t BlockToHeaderLength(uint16_t length_in_bytes) { void CreateHeader(uint8_t count_or_format, // Depends on packet type. uint8_t packet_type, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { + assert(length <= 0xffff); const uint8_t kVersion = 2; AssignUWord8(buffer, pos, (kVersion << 6) + count_or_format); AssignUWord8(buffer, pos, packet_type); @@ -98,9 +117,9 @@ void CreateHeader(uint8_t count_or_format, // Depends on packet type. // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ void CreateSenderReport(const RTCPPacketSR& sr, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { CreateHeader(sr.NumberOfReportBlocks, PT_SR, length, buffer, pos); AssignUWord32(buffer, pos, sr.SenderSSRC); AssignUWord32(buffer, pos, sr.NTPMostSignificant); @@ -120,9 +139,9 @@ void CreateSenderReport(const RTCPPacketSR& sr, // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ void CreateReceiverReport(const RTCPPacketRR& rr, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { CreateHeader(rr.NumberOfReportBlocks, PT_RR, length, buffer, pos); AssignUWord32(buffer, pos, rr.SenderSSRC); } @@ -144,16 +163,89 @@ void CreateReceiverReport(const RTCPPacketRR& rr, // | delay since last SR (DLSR) | // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -void CreateReportBlock(const RTCPPacketReportBlockItem& report_block, - uint8_t* buffer, - uint16_t* pos) { - AssignUWord32(buffer, pos, report_block.SSRC); - AssignUWord8(buffer, pos, report_block.FractionLost); - AssignUWord24(buffer, pos, report_block.CumulativeNumOfPacketsLost); - AssignUWord32(buffer, pos, report_block.ExtendedHighestSequenceNumber); - AssignUWord32(buffer, pos, report_block.Jitter); - AssignUWord32(buffer, pos, report_block.LastSR); - AssignUWord32(buffer, pos, report_block.DelayLastSR); +void CreateReportBlocks(const std::vector<RTCPPacketReportBlockItem>& blocks, + uint8_t* buffer, + size_t* pos) { + for (std::vector<RTCPPacketReportBlockItem>::const_iterator + it = blocks.begin(); it != blocks.end(); ++it) { + AssignUWord32(buffer, pos, (*it).SSRC); + AssignUWord8(buffer, pos, (*it).FractionLost); + AssignUWord24(buffer, pos, (*it).CumulativeNumOfPacketsLost); + AssignUWord32(buffer, pos, (*it).ExtendedHighestSequenceNumber); + AssignUWord32(buffer, pos, (*it).Jitter); + AssignUWord32(buffer, pos, (*it).LastSR); + AssignUWord32(buffer, pos, (*it).DelayLastSR); + } +} + +// Transmission Time Offsets in RTP Streams (RFC 5450). +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// hdr |V=2|P| RC | PT=IJ=195 | length | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | inter-arrival jitter | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// . . +// . . +// . . +// | inter-arrival jitter | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +void CreateIj(const std::vector<uint32_t>& ij_items, + uint8_t* buffer, + size_t* pos) { + size_t length = ij_items.size(); + CreateHeader(length, PT_IJ, length, buffer, pos); + for (std::vector<uint32_t>::const_iterator it = ij_items.begin(); + it != ij_items.end(); ++it) { + AssignUWord32(buffer, pos, *it); + } +} + +// Source Description (SDES) (RFC 3550). +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// header |V=2|P| SC | PT=SDES=202 | length | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// chunk | SSRC/CSRC_1 | +// 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | SDES items | +// | ... | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// chunk | SSRC/CSRC_2 | +// 2 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | SDES items | +// | ... | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// +// Canonical End-Point Identifier SDES Item (CNAME) +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | CNAME=1 | length | user and domain name ... +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +void CreateSdes(const std::vector<Sdes::Chunk>& chunks, + size_t length, + uint8_t* buffer, + size_t* pos) { + CreateHeader(chunks.size(), PT_SDES, length, buffer, pos); + const uint8_t kSdesItemType = 1; + for (std::vector<Sdes::Chunk>::const_iterator it = chunks.begin(); + it != chunks.end(); ++it) { + AssignUWord32(buffer, pos, (*it).ssrc); + AssignUWord8(buffer, pos, kSdesItemType); + AssignUWord8(buffer, pos, (*it).name.length()); + memcpy(buffer + *pos, (*it).name.data(), (*it).name.length()); + *pos += (*it).name.length(); + memset(buffer + *pos, 0, (*it).null_octets); + *pos += (*it).null_octets; + } } // Bye packet (BYE) (RFC 3550). @@ -171,9 +263,9 @@ void CreateReportBlock(const RTCPPacketReportBlockItem& report_block, void CreateBye(const RTCPPacketBYE& bye, const std::vector<uint32_t>& csrcs, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { CreateHeader(length, PT_BYE, length, buffer, pos); AssignUWord32(buffer, pos, bye.SenderSSRC); for (std::vector<uint32_t>::const_iterator it = csrcs.begin(); @@ -182,6 +274,32 @@ void CreateBye(const RTCPPacketBYE& bye, } } +// Application-Defined packet (APP) (RFC 3550). +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// |V=2|P| subtype | PT=APP=204 | length | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | SSRC/CSRC | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | name (ASCII) | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | application-dependent data ... +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +void CreateApp(const RTCPPacketAPP& app, + uint32_t ssrc, + size_t length, + uint8_t* buffer, + size_t* pos) { + CreateHeader(app.SubType, PT_APP, length, buffer, pos); + AssignUWord32(buffer, pos, ssrc); + AssignUWord32(buffer, pos, app.Name); + memcpy(buffer + *pos, app.Data, app.Size); + *pos += app.Size; +} + // RFC 4585: Feedback format. // // Common packet format: @@ -199,6 +317,47 @@ void CreateBye(const RTCPPacketBYE& bye, // : // +// Picture loss indication (PLI) (RFC 4585). +// +// FCI: no feedback control information. + +void CreatePli(const RTCPPacketPSFBPLI& pli, + size_t length, + uint8_t* buffer, + size_t* pos) { + const uint8_t kFmt = 1; + CreateHeader(kFmt, PT_PSFB, length, buffer, pos); + AssignUWord32(buffer, pos, pli.SenderSSRC); + AssignUWord32(buffer, pos, pli.MediaSSRC); +} + +// Slice loss indication (SLI) (RFC 4585). +// +// FCI: +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | First | Number | PictureID | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +void CreateSli(const RTCPPacketPSFBSLI& sli, + const RTCPPacketPSFBSLIItem& sli_item, + size_t length, + uint8_t* buffer, + size_t* pos) { + const uint8_t kFmt = 2; + CreateHeader(kFmt, PT_PSFB, length, buffer, pos); + AssignUWord32(buffer, pos, sli.SenderSSRC); + AssignUWord32(buffer, pos, sli.MediaSSRC); + + AssignUWord8(buffer, pos, sli_item.FirstMB >> 5); + AssignUWord8(buffer, pos, (sli_item.FirstMB << 3) + + ((sli_item.NumberOfMB >> 10) & 0x07)); + AssignUWord8(buffer, pos, sli_item.NumberOfMB >> 2); + AssignUWord8(buffer, pos, (sli_item.NumberOfMB << 6) + sli_item.PictureId); +} + // Generic NACK (RFC 4585). // // FCI: @@ -211,9 +370,9 @@ void CreateBye(const RTCPPacketBYE& bye, void CreateNack(const RTCPPacketRTPFBNACK& nack, const std::vector<RTCPPacketRTPFBNACKItem>& nack_fields, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { const uint8_t kFmt = 1; CreateHeader(kFmt, PT_RTPFB, length, buffer, pos); AssignUWord32(buffer, pos, nack.SenderSSRC); @@ -239,9 +398,9 @@ void CreateNack(const RTCPPacketRTPFBNACK& nack, void CreateRpsi(const RTCPPacketPSFBRPSI& rpsi, uint8_t padding_bytes, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { // Native bit string should be a multiple of 8 bits. assert(rpsi.NumberOfValidBits % 8 == 0); const uint8_t kFmt = 3; @@ -270,9 +429,9 @@ void CreateRpsi(const RTCPPacketPSFBRPSI& rpsi, void CreateFir(const RTCPPacketPSFBFIR& fir, const RTCPPacketPSFBFIRItem& fir_item, - uint16_t length, + size_t length, uint8_t* buffer, - uint16_t* pos) { + size_t* pos) { const uint8_t kFmt = 4; CreateHeader(kFmt, PT_PSFB, length, buffer, pos); AssignUWord32(buffer, pos, fir.SenderSSRC); @@ -281,16 +440,6 @@ void CreateFir(const RTCPPacketPSFBFIR& fir, AssignUWord8(buffer, pos, fir_item.CommandSequenceNumber); AssignUWord24(buffer, pos, 0); } - -template <typename T> -void AppendBlocks(const std::vector<T*>& blocks, - uint8_t* buffer, - uint16_t* pos) { - for (typename std::vector<T*>::const_iterator it = blocks.begin(); - it != blocks.end(); ++it) { - (*it)->Create(buffer, pos); - } -} } // namespace void RtcpPacket::Append(RtcpPacket* packet) { @@ -299,39 +448,41 @@ void RtcpPacket::Append(RtcpPacket* packet) { } RawPacket RtcpPacket::Build() const { - uint16_t len = 0; + size_t length = 0; uint8_t packet[IP_PACKET_SIZE]; - CreateAndAddAppended(packet, &len, IP_PACKET_SIZE); - return RawPacket(packet, len); + CreateAndAddAppended(packet, &length, IP_PACKET_SIZE); + return RawPacket(packet, length); } -void RtcpPacket::Build(uint8_t* packet, uint16_t* len, uint16_t max_len) const { - *len = 0; - CreateAndAddAppended(packet, len, max_len); +void RtcpPacket::Build(uint8_t* packet, + size_t* length, + size_t max_length) const { + *length = 0; + CreateAndAddAppended(packet, length, max_length); } void RtcpPacket::CreateAndAddAppended(uint8_t* packet, - uint16_t* len, - uint16_t max_len) const { - Create(packet, len, max_len); + size_t* length, + size_t max_length) const { + Create(packet, length, max_length); for (std::vector<RtcpPacket*>::const_iterator it = appended_packets_.begin(); it != appended_packets_.end(); ++it) { - (*it)->CreateAndAddAppended(packet, len, max_len); + (*it)->CreateAndAddAppended(packet, length, max_length); } } -void Empty::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const { +void Empty::Create(uint8_t* packet, size_t* length, size_t max_length) const { } void SenderReport::Create(uint8_t* packet, - uint16_t* len, - uint16_t max_len) const { - if (*len + Length() > max_len) { + size_t* length, + size_t max_length) const { + if (*length + BlockLength() > max_length) { LOG(LS_WARNING) << "Max packet size reached."; return; } - CreateSenderReport(sr_, BlockToHeaderLength(Length()), packet, len); - AppendBlocks(report_blocks_, packet, len); + CreateSenderReport(sr_, BlockToHeaderLength(BlockLength()), packet, length); + CreateReportBlocks(report_blocks_, packet, length); } void SenderReport::WithReportBlock(ReportBlock* block) { @@ -340,19 +491,19 @@ void SenderReport::WithReportBlock(ReportBlock* block) { LOG(LS_WARNING) << "Max report blocks reached."; return; } - report_blocks_.push_back(block); + report_blocks_.push_back(block->report_block_); sr_.NumberOfReportBlocks = report_blocks_.size(); } void ReceiverReport::Create(uint8_t* packet, - uint16_t* len, - uint16_t max_len) const { - if (*len + Length() > max_len) { + size_t* length, + size_t max_length) const { + if (*length + BlockLength() > max_length) { LOG(LS_WARNING) << "Max packet size reached."; return; } - CreateReceiverReport(rr_, BlockToHeaderLength(Length()), packet, len); - AppendBlocks(report_blocks_, packet, len); + CreateReceiverReport(rr_, BlockToHeaderLength(BlockLength()), packet, length); + CreateReportBlocks(report_blocks_, packet, length); } void ReceiverReport::WithReportBlock(ReportBlock* block) { @@ -361,20 +512,71 @@ void ReceiverReport::WithReportBlock(ReportBlock* block) { LOG(LS_WARNING) << "Max report blocks reached."; return; } - report_blocks_.push_back(block); + report_blocks_.push_back(block->report_block_); rr_.NumberOfReportBlocks = report_blocks_.size(); } -void ReportBlock::Create(uint8_t* packet, uint16_t* len) const { - CreateReportBlock(report_block_, packet, len); +void Ij::Create(uint8_t* packet, size_t* length, size_t max_length) const { + if (*length + BlockLength() > max_length) { + LOG(LS_WARNING) << "Max packet size reached."; + return; + } + CreateIj(ij_items_, packet, length); +} + +void Ij::WithJitterItem(uint32_t jitter) { + if (ij_items_.size() >= kMaxNumberOfIjItems) { + LOG(LS_WARNING) << "Max inter-arrival jitter items reached."; + return; + } + ij_items_.push_back(jitter); +} + +void Sdes::Create(uint8_t* packet, size_t* length, size_t max_length) const { + assert(!chunks_.empty()); + if (*length + BlockLength() > max_length) { + LOG(LS_WARNING) << "Max packet size reached."; + return; + } + CreateSdes(chunks_, BlockToHeaderLength(BlockLength()), packet, length); +} + +void Sdes::WithCName(uint32_t ssrc, std::string cname) { + assert(cname.length() <= 0xff); + if (chunks_.size() >= kMaxNumberOfChunks) { + LOG(LS_WARNING) << "Max SDES chunks reached."; + return; + } + // In each chunk, the list of items must be terminated by one or more null + // octets. The next chunk must start on a 32-bit boundary. + // CNAME (1 byte) | length (1 byte) | name | padding. + int null_octets = 4 - ((2 + cname.length()) % 4); + Chunk chunk; + chunk.ssrc = ssrc; + chunk.name = cname; + chunk.null_octets = null_octets; + chunks_.push_back(chunk); } -void Bye::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const { - if (*len + Length() > max_len) { +size_t Sdes::BlockLength() const { + // Header (4 bytes). + // Chunk: + // SSRC/CSRC (4 bytes) | CNAME (1 byte) | length (1 byte) | name | padding. + size_t length = kHeaderLength; + for (std::vector<Chunk>::const_iterator it = chunks_.begin(); + it != chunks_.end(); ++it) { + length += 6 + (*it).name.length() + (*it).null_octets; + } + assert(length % 4 == 0); + return length; +} + +void Bye::Create(uint8_t* packet, size_t* length, size_t max_length) const { + if (*length + BlockLength() > max_length) { LOG(LS_WARNING) << "Max packet size reached."; return; } - CreateBye(bye_, csrcs_, BlockToHeaderLength(Length()), packet, len); + CreateBye(bye_, csrcs_, BlockToHeaderLength(BlockLength()), packet, length); } void Bye::WithCsrc(uint32_t csrc) { @@ -385,13 +587,39 @@ void Bye::WithCsrc(uint32_t csrc) { csrcs_.push_back(csrc); } -void Nack::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const { +void App::Create(uint8_t* packet, size_t* length, size_t max_length) const { + if (*length + BlockLength() > max_length) { + LOG(LS_WARNING) << "Max packet size reached."; + return; + } + CreateApp(app_, ssrc_, BlockToHeaderLength(BlockLength()), packet, length); +} + +void Pli::Create(uint8_t* packet, size_t* length, size_t max_length) const { + if (*length + BlockLength() > max_length) { + LOG(LS_WARNING) << "Max packet size reached."; + return; + } + CreatePli(pli_, BlockToHeaderLength(BlockLength()), packet, length); +} + +void Sli::Create(uint8_t* packet, size_t* length, size_t max_length) const { + if (*length + BlockLength() > max_length) { + LOG(LS_WARNING) << "Max packet size reached."; + return; + } + CreateSli(sli_, sli_item_, BlockToHeaderLength(BlockLength()), packet, + length); +} + +void Nack::Create(uint8_t* packet, size_t* length, size_t max_length) const { assert(!nack_fields_.empty()); - if (*len + Length() > max_len) { + if (*length + BlockLength() > max_length) { LOG(LS_WARNING) << "Max packet size reached."; return; } - CreateNack(nack_, nack_fields_, BlockToHeaderLength(Length()), packet, len); + CreateNack(nack_, nack_fields_, BlockToHeaderLength(BlockLength()), packet, + length); } void Nack::WithList(const uint16_t* nack_list, int length) { @@ -418,13 +646,14 @@ void Nack::WithList(const uint16_t* nack_list, int length) { } } -void Rpsi::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const { +void Rpsi::Create(uint8_t* packet, size_t* length, size_t max_length) const { assert(rpsi_.NumberOfValidBits > 0); - if (*len + Length() > max_len) { + if (*length + BlockLength() > max_length) { LOG(LS_WARNING) << "Max packet size reached."; return; } - CreateRpsi(rpsi_, padding_bytes_, BlockToHeaderLength(Length()), packet, len); + CreateRpsi(rpsi_, padding_bytes_, BlockToHeaderLength(BlockLength()), packet, + length); } void Rpsi::WithPictureId(uint64_t picture_id) { @@ -454,12 +683,13 @@ void Rpsi::WithPictureId(uint64_t picture_id) { } } -void Fir::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const { - if (*len + Length() > max_len) { +void Fir::Create(uint8_t* packet, size_t* length, size_t max_length) const { + if (*length + BlockLength() > max_length) { LOG(LS_WARNING) << "Max packet size reached."; return; } - CreateFir(fir_, fir_item_, BlockToHeaderLength(Length()), packet, len); + CreateFir(fir_, fir_item_, BlockToHeaderLength(BlockLength()), packet, + length); } } // namespace rtcp } // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_packet.h b/modules/rtp_rtcp/source/rtcp_packet.h index 641bd7fd..f60e848b 100644 --- a/modules/rtp_rtcp/source/rtcp_packet.h +++ b/modules/rtp_rtcp/source/rtcp_packet.h @@ -12,6 +12,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_RTCP_PACKET_H_ #define WEBRTC_MODULES_RTP_RTCP_RTCP_PACKET_H_ +#include <map> +#include <string> #include <vector> #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" @@ -21,8 +23,10 @@ namespace webrtc { namespace rtcp { +enum { kCommonFbFmtLength = 12 }; +enum { kReportBlockLength = 24 }; + class RawPacket; -class ReportBlock; // Class for building RTCP packets. // @@ -40,9 +44,9 @@ class ReportBlock; // fir.To(234) // fir.WithCommandSeqNum(123); // -// uint16_t len = 0; // Builds an intra frame request +// size_t length = 0; // Builds an intra frame request // uint8_t packet[kPacketSize]; // with sequence number 123. -// fir.Build(packet, &len, kPacketSize); +// fir.Build(packet, &length, kPacketSize); // // RawPacket packet = fir.Build(); // Returns a RawPacket holding // // the built rtcp packet. @@ -59,18 +63,20 @@ class RtcpPacket { RawPacket Build() const; - void Build(uint8_t* packet, uint16_t* len, uint16_t max_len) const; + void Build(uint8_t* packet, size_t* length, size_t max_length) const; protected: - RtcpPacket() {} + RtcpPacket() : kHeaderLength(4) {} virtual void Create( - uint8_t* packet, uint16_t* len, uint16_t max_len) const = 0; + uint8_t* packet, size_t* length, size_t max_length) const = 0; - void CreateAndAddAppended( - uint8_t* packet, uint16_t* len, uint16_t max_len) const; + const size_t kHeaderLength; private: + void CreateAndAddAppended( + uint8_t* packet, size_t* length, size_t max_length) const; + std::vector<RtcpPacket*> appended_packets_; }; @@ -81,11 +87,66 @@ class Empty : public RtcpPacket { virtual ~Empty() {} protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const; + virtual void Create(uint8_t* packet, size_t* length, size_t max_length) const; }; -//// From RFC 3550, RTP: A Transport Protocol for Real-Time Applications. +// From RFC 3550, RTP: A Transport Protocol for Real-Time Applications. // +// RTCP report block (RFC 3550). +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// | SSRC_1 (SSRC of first source) | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | fraction lost | cumulative number of packets lost | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | extended highest sequence number received | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | interarrival jitter | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | last SR (LSR) | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | delay since last SR (DLSR) | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ + +class ReportBlock { + public: + ReportBlock() { + // TODO(asapersson): Consider adding a constructor to struct. + memset(&report_block_, 0, sizeof(report_block_)); + } + + ~ReportBlock() {} + + void To(uint32_t ssrc) { + report_block_.SSRC = ssrc; + } + void WithFractionLost(uint8_t fraction_lost) { + report_block_.FractionLost = fraction_lost; + } + void WithCumulativeLost(uint32_t cumulative_lost) { + report_block_.CumulativeNumOfPacketsLost = cumulative_lost; + } + void WithExtHighestSeqNum(uint32_t ext_highest_seq_num) { + report_block_.ExtendedHighestSequenceNumber = ext_highest_seq_num; + } + void WithJitter(uint32_t jitter) { + report_block_.Jitter = jitter; + } + void WithLastSr(uint32_t last_sr) { + report_block_.LastSR = last_sr; + } + void WithDelayLastSr(uint32_t delay_last_sr) { + report_block_.DelayLastSR = delay_last_sr; + } + + private: + friend class SenderReport; + friend class ReceiverReport; + RTCPUtility::RTCPPacketReportBlockItem report_block_; +}; + // RTCP sender report (RFC 3550). // // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 @@ -109,8 +170,7 @@ class Empty : public RtcpPacket { class SenderReport : public RtcpPacket { public: - SenderReport() - : RtcpPacket() { + SenderReport() : RtcpPacket() { memset(&sr_, 0, sizeof(sr_)); } @@ -136,20 +196,22 @@ class SenderReport : public RtcpPacket { } void WithReportBlock(ReportBlock* block); - enum { kMaxNumberOfReportBlocks = 0x1f }; - protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const; + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - uint16_t Length() const { - const uint16_t kSrBlockLen = 28; - const uint16_t kReportBlockLen = 24; - return kSrBlockLen + report_blocks_.size() * kReportBlockLen; + enum { kMaxNumberOfReportBlocks = 0x1f }; + + size_t BlockLength() const { + const size_t kSrHeaderLength = 8; + const size_t kSenderInfoLength = 20; + return kSrHeaderLength + kSenderInfoLength + + report_blocks_.size() * kReportBlockLength; } RTCPUtility::RTCPPacketSR sr_; - std::vector<ReportBlock*> report_blocks_; + std::vector<RTCPUtility::RTCPPacketReportBlockItem> report_blocks_; }; // @@ -167,8 +229,7 @@ class SenderReport : public RtcpPacket { class ReceiverReport : public RtcpPacket { public: - ReceiverReport() - : RtcpPacket() { + ReceiverReport() : RtcpPacket() { memset(&rr_, 0, sizeof(rr_)); } @@ -179,75 +240,117 @@ class ReceiverReport : public RtcpPacket { } void WithReportBlock(ReportBlock* block); - enum { kMaxNumberOfReportBlocks = 0x1f }; - protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const; + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - uint16_t Length() const { - const uint16_t kRrBlockLen = 8; - const uint16_t kReportBlockLen = 24; - return kRrBlockLen + report_blocks_.size() * kReportBlockLen; + enum { kMaxNumberOfReportBlocks = 0x1f }; + + size_t BlockLength() const { + const size_t kRrHeaderLength = 8; + return kRrHeaderLength + report_blocks_.size() * kReportBlockLength; } RTCPUtility::RTCPPacketRR rr_; - std::vector<ReportBlock*> report_blocks_; + std::vector<RTCPUtility::RTCPPacketReportBlockItem> report_blocks_; }; +// Transmission Time Offsets in RTP Streams (RFC 5450). // -// RTCP report block (RFC 3550). +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// hdr |V=2|P| RC | PT=IJ=195 | length | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | inter-arrival jitter | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// . . +// . . +// . . +// | inter-arrival jitter | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // -// 0 1 2 3 -// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 -// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -// | SSRC_1 (SSRC of first source) | -// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -// | fraction lost | cumulative number of packets lost | -// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -// | extended highest sequence number received | -// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -// | interarrival jitter | -// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -// | last SR (LSR) | -// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -// | delay since last SR (DLSR) | -// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// If present, this RTCP packet must be placed after a receiver report +// (inside a compound RTCP packet), and MUST have the same value for RC +// (reception report count) as the receiver report. -class ReportBlock { +class Ij : public RtcpPacket { public: - ReportBlock() { - memset(&report_block_, 0, sizeof(report_block_)); - } + Ij() : RtcpPacket() {} - ~ReportBlock() {} + virtual ~Ij() {} - void To(uint32_t ssrc) { - report_block_.SSRC = ssrc; - } - void WithFractionLost(uint8_t fraction_lost) { - report_block_.FractionLost = fraction_lost; - } - void WithCumPacketsLost(uint32_t cum_packets_lost) { - report_block_.CumulativeNumOfPacketsLost = cum_packets_lost; - } - void WithExtHighestSeqNum(uint32_t ext_highest_seq_num) { - report_block_.ExtendedHighestSequenceNumber = ext_highest_seq_num; - } - void WithJitter(uint32_t jitter) { - report_block_.Jitter = jitter; - } - void WithLastSr(uint32_t last_sr) { - report_block_.LastSR = last_sr; - } - void WithDelayLastSr(uint32_t delay_last_sr) { - report_block_.DelayLastSR = delay_last_sr; + void WithJitterItem(uint32_t jitter); + + protected: + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; + + private: + enum { kMaxNumberOfIjItems = 0x1f }; + + size_t BlockLength() const { + return kHeaderLength + 4 * ij_items_.size(); } - void Create(uint8_t* packet, uint16_t* len) const; + std::vector<uint32_t> ij_items_; + + DISALLOW_COPY_AND_ASSIGN(Ij); +}; + +// Source Description (SDES) (RFC 3550). +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// header |V=2|P| SC | PT=SDES=202 | length | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// chunk | SSRC/CSRC_1 | +// 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | SDES items | +// | ... | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// chunk | SSRC/CSRC_2 | +// 2 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | SDES items | +// | ... | +// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +// +// Canonical End-Point Identifier SDES Item (CNAME) +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | CNAME=1 | length | user and domain name ... +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +class Sdes : public RtcpPacket { + public: + Sdes() : RtcpPacket() {} + + virtual ~Sdes() {} + + void WithCName(uint32_t ssrc, std::string cname); + + struct Chunk { + uint32_t ssrc; + std::string name; + int null_octets; + }; + + protected: + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - RTCPUtility::RTCPPacketReportBlockItem report_block_; + enum { kMaxNumberOfChunks = 0x1f }; + + size_t BlockLength() const; + + std::vector<Chunk> chunks_; + + DISALLOW_COPY_AND_ASSIGN(Sdes); }; // @@ -266,8 +369,7 @@ class ReportBlock { class Bye : public RtcpPacket { public: - Bye() - : RtcpPacket() { + Bye() : RtcpPacket() { memset(&bye_, 0, sizeof(bye_)); } @@ -278,21 +380,79 @@ class Bye : public RtcpPacket { } void WithCsrc(uint32_t csrc); - enum { kMaxNumberOfCsrcs = 0x1f - 1 }; - protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const; + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - uint16_t Length() const { - const uint16_t kByeBlockLen = 8 + 4 * csrcs_.size(); - return kByeBlockLen; + enum { kMaxNumberOfCsrcs = 0x1f - 1 }; + + size_t BlockLength() const { + size_t source_count = 1 + csrcs_.size(); + return kHeaderLength + 4 * source_count; } RTCPUtility::RTCPPacketBYE bye_; std::vector<uint32_t> csrcs_; }; +// Application-Defined packet (APP) (RFC 3550). +// +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// |V=2|P| subtype | PT=APP=204 | length | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | SSRC/CSRC | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | name (ASCII) | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | application-dependent data ... +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +class App : public RtcpPacket { + public: + App() + : RtcpPacket(), + ssrc_(0) { + memset(&app_, 0, sizeof(app_)); + } + + virtual ~App() {} + + void From(uint32_t ssrc) { + ssrc_ = ssrc; + } + void WithSubType(uint8_t subtype) { + assert(subtype <= 0x1f); + app_.SubType = subtype; + } + void WithName(uint32_t name) { + app_.Name = name; + } + void WithData(const uint8_t* data, uint16_t data_length) { + assert(data); + assert(data_length <= kRtcpAppCode_DATA_SIZE); + assert(data_length % 4 == 0); + memcpy(app_.Data, data, data_length); + app_.Size = data_length; + } + + protected: + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; + + private: + size_t BlockLength() const { + return 12 + app_.Size; + } + + uint32_t ssrc_; + RTCPUtility::RTCPPacketAPP app_; + + DISALLOW_COPY_AND_ASSIGN(App); +}; + // RFC 4585: Feedback format. // // Common packet format: @@ -309,6 +469,92 @@ class Bye : public RtcpPacket { // : Feedback Control Information (FCI) : // : +// Picture loss indication (PLI) (RFC 4585). +// +// FCI: no feedback control information. + +class Pli : public RtcpPacket { + public: + Pli() : RtcpPacket() { + memset(&pli_, 0, sizeof(pli_)); + } + + virtual ~Pli() {} + + void From(uint32_t ssrc) { + pli_.SenderSSRC = ssrc; + } + void To(uint32_t ssrc) { + pli_.MediaSSRC = ssrc; + } + + protected: + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; + + private: + size_t BlockLength() const { + return kCommonFbFmtLength; + } + + RTCPUtility::RTCPPacketPSFBPLI pli_; + + DISALLOW_COPY_AND_ASSIGN(Pli); +}; + +// Slice loss indication (SLI) (RFC 4585). +// +// FCI: +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | First | Number | PictureID | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +class Sli : public RtcpPacket { + public: + Sli() : RtcpPacket() { + memset(&sli_, 0, sizeof(sli_)); + memset(&sli_item_, 0, sizeof(sli_item_)); + } + + virtual ~Sli() {} + + void From(uint32_t ssrc) { + sli_.SenderSSRC = ssrc; + } + void To(uint32_t ssrc) { + sli_.MediaSSRC = ssrc; + } + void WithFirstMb(uint16_t first_mb) { + assert(first_mb <= 0x1fff); + sli_item_.FirstMB = first_mb; + } + void WithNumberOfMb(uint16_t number_mb) { + assert(number_mb <= 0x1fff); + sli_item_.NumberOfMB = number_mb; + } + void WithPictureId(uint8_t picture_id) { + assert(picture_id <= 0x3f); + sli_item_.PictureId = picture_id; + } + + protected: + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; + + private: + size_t BlockLength() const { + const size_t kFciLength = 4; + return kCommonFbFmtLength + kFciLength; + } + + RTCPUtility::RTCPPacketPSFBSLI sli_; + RTCPUtility::RTCPPacketPSFBSLIItem sli_item_; + + DISALLOW_COPY_AND_ASSIGN(Sli); +}; + // Generic NACK (RFC 4585). // // FCI: @@ -320,8 +566,7 @@ class Bye : public RtcpPacket { class Nack : public RtcpPacket { public: - Nack() - : RtcpPacket() { + Nack() : RtcpPacket() { memset(&nack_, 0, sizeof(nack_)); } @@ -336,13 +581,13 @@ class Nack : public RtcpPacket { void WithList(const uint16_t* nack_list, int length); protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const - OVERRIDE; + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - uint16_t Length() const { - const uint16_t kNackBlockLen = 4 * (3 + nack_fields_.size()); - return kNackBlockLen; + size_t BlockLength() const { + size_t fci_length = 4 * nack_fields_.size(); + return kCommonFbFmtLength + fci_length; } RTCPUtility::RTCPPacketRTPFBNACK nack_; @@ -366,8 +611,8 @@ class Nack : public RtcpPacket { class Rpsi : public RtcpPacket { public: Rpsi() - : RtcpPacket(), - padding_bytes_(0) { + : RtcpPacket(), + padding_bytes_(0) { memset(&rpsi_, 0, sizeof(rpsi_)); } @@ -386,14 +631,13 @@ class Rpsi : public RtcpPacket { void WithPictureId(uint64_t picture_id); protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const - OVERRIDE; + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - uint16_t Length() const { - const uint16_t kRpsiBlockLen = - 12 + 2 + (rpsi_.NumberOfValidBits / 8) + padding_bytes_; - return kRpsiBlockLen; + size_t BlockLength() const { + size_t fci_length = 2 + (rpsi_.NumberOfValidBits / 8) + padding_bytes_; + return kCommonFbFmtLength + fci_length; } uint8_t padding_bytes_; @@ -417,7 +661,7 @@ class Rpsi : public RtcpPacket { class Fir : public RtcpPacket { public: Fir() - : RtcpPacket() { + : RtcpPacket() { memset(&fir_, 0, sizeof(fir_)); memset(&fir_item_, 0, sizeof(fir_item_)); } @@ -435,12 +679,13 @@ class Fir : public RtcpPacket { } protected: - virtual void Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const; + virtual void Create( + uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE; private: - uint16_t Length() const { - const uint16_t kFirBlockLen = 20; - return kFirBlockLen; + size_t BlockLength() const { + const size_t kFciLength = 8; + return kCommonFbFmtLength + kFciLength; } RTCPUtility::RTCPPacketPSFBFIR fir_; @@ -450,7 +695,7 @@ class Fir : public RtcpPacket { // Class holding a RTCP packet. // // Takes a built rtcp packet. -// RawPacket raw_packet(buffer, len); +// RawPacket raw_packet(buffer, length); // // To access the raw packet: // raw_packet.buffer(); - pointer to the raw packet @@ -458,22 +703,22 @@ class Fir : public RtcpPacket { class RawPacket { public: - RawPacket(const uint8_t* buffer, uint16_t len) { - assert(len <= IP_PACKET_SIZE); - memcpy(packet_, buffer, len); - packet_length_ = len; + RawPacket(const uint8_t* packet, size_t length) { + assert(length <= IP_PACKET_SIZE); + memcpy(buffer_, packet, length); + buffer_length_ = length; } const uint8_t* buffer() { - return packet_; + return buffer_; } - uint16_t buffer_length() const { - return packet_length_; + size_t buffer_length() const { + return buffer_length_; } private: - uint16_t packet_length_; - uint8_t packet_[IP_PACKET_SIZE]; + size_t buffer_length_; + uint8_t buffer_[IP_PACKET_SIZE]; }; } // namespace rtcp diff --git a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc index d7ae9142..aa25c2e5 100644 --- a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc @@ -15,16 +15,21 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/test/rtcp_packet_parser.h" +using webrtc::rtcp::App; using webrtc::rtcp::Bye; using webrtc::rtcp::Empty; using webrtc::rtcp::Fir; +using webrtc::rtcp::Ij; using webrtc::rtcp::Nack; +using webrtc::rtcp::Pli; +using webrtc::rtcp::Sdes; +using webrtc::rtcp::SenderReport; +using webrtc::rtcp::Sli; using webrtc::rtcp::RawPacket; using webrtc::rtcp::ReceiverReport; using webrtc::rtcp::ReportBlock; using webrtc::rtcp::Rpsi; using webrtc::test::RtcpPacketParser; -using webrtc::rtcp::SenderReport; namespace webrtc { @@ -47,7 +52,7 @@ TEST(RtcpPacketTest, RrWithOneReportBlock) { ReportBlock rb; rb.To(kRemoteSsrc); rb.WithFractionLost(55); - rb.WithCumPacketsLost(0x111111); + rb.WithCumulativeLost(0x111111); rb.WithExtHighestSeqNum(0x22222222); rb.WithJitter(0x33333333); rb.WithLastSr(0x44444444); @@ -154,6 +159,164 @@ TEST(RtcpPacketTest, SrWithTwoReportBlocks) { EXPECT_EQ(1, parser.report_blocks_per_ssrc(kRemoteSsrc + 1)); } +TEST(RtcpPacketTest, IjNoItem) { + Ij ij; + + RawPacket packet = ij.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.ij()->num_packets()); + EXPECT_EQ(0, parser.ij_item()->num_packets()); +} + +TEST(RtcpPacketTest, IjOneItem) { + Ij ij; + ij.WithJitterItem(0x11111111); + + RawPacket packet = ij.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.ij()->num_packets()); + EXPECT_EQ(1, parser.ij_item()->num_packets()); + EXPECT_EQ(0x11111111U, parser.ij_item()->Jitter()); +} + +TEST(RtcpPacketTest, IjTwoItems) { + Ij ij; + ij.WithJitterItem(0x11111111); + ij.WithJitterItem(0x22222222); + + RawPacket packet = ij.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.ij()->num_packets()); + EXPECT_EQ(2, parser.ij_item()->num_packets()); + EXPECT_EQ(0x22222222U, parser.ij_item()->Jitter()); +} + +TEST(RtcpPacketTest, AppWithNoData) { + App app; + app.WithSubType(30); + uint32_t name = 'n' << 24; + name += 'a' << 16; + name += 'm' << 8; + name += 'e'; + app.WithName(name); + + RawPacket packet = app.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.app()->num_packets()); + EXPECT_EQ(30U, parser.app()->SubType()); + EXPECT_EQ(name, parser.app()->Name()); + EXPECT_EQ(0, parser.app_item()->num_packets()); +} + +TEST(RtcpPacketTest, App) { + App app; + app.From(kSenderSsrc); + app.WithSubType(30); + uint32_t name = 'n' << 24; + name += 'a' << 16; + name += 'm' << 8; + name += 'e'; + app.WithName(name); + const char kData[] = {'t', 'e', 's', 't', 'd', 'a', 't', 'a'}; + const size_t kDataLength = sizeof(kData) / sizeof(kData[0]); + app.WithData((const uint8_t*)kData, kDataLength); + + RawPacket packet = app.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.app()->num_packets()); + EXPECT_EQ(30U, parser.app()->SubType()); + EXPECT_EQ(name, parser.app()->Name()); + EXPECT_EQ(1, parser.app_item()->num_packets()); + EXPECT_EQ(kDataLength, parser.app_item()->DataLength()); + EXPECT_EQ(0, strncmp(kData, (const char*)parser.app_item()->Data(), + parser.app_item()->DataLength())); +} + +TEST(RtcpPacketTest, SdesWithOneChunk) { + Sdes sdes; + sdes.WithCName(kSenderSsrc, "alice@host"); + + RawPacket packet = sdes.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.sdes()->num_packets()); + EXPECT_EQ(1, parser.sdes_chunk()->num_packets()); + EXPECT_EQ(kSenderSsrc, parser.sdes_chunk()->Ssrc()); + EXPECT_EQ("alice@host", parser.sdes_chunk()->Cname()); +} + +TEST(RtcpPacketTest, SdesWithMultipleChunks) { + Sdes sdes; + sdes.WithCName(kSenderSsrc, "a"); + sdes.WithCName(kSenderSsrc + 1, "ab"); + sdes.WithCName(kSenderSsrc + 2, "abc"); + sdes.WithCName(kSenderSsrc + 3, "abcd"); + sdes.WithCName(kSenderSsrc + 4, "abcde"); + sdes.WithCName(kSenderSsrc + 5, "abcdef"); + + RawPacket packet = sdes.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.sdes()->num_packets()); + EXPECT_EQ(6, parser.sdes_chunk()->num_packets()); + EXPECT_EQ(kSenderSsrc + 5, parser.sdes_chunk()->Ssrc()); + EXPECT_EQ("abcdef", parser.sdes_chunk()->Cname()); +} + +TEST(RtcpPacketTest, CnameItemWithEmptyString) { + Sdes sdes; + sdes.WithCName(kSenderSsrc, ""); + + RawPacket packet = sdes.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.sdes()->num_packets()); + EXPECT_EQ(1, parser.sdes_chunk()->num_packets()); + EXPECT_EQ(kSenderSsrc, parser.sdes_chunk()->Ssrc()); + EXPECT_EQ("", parser.sdes_chunk()->Cname()); +} + +TEST(RtcpPacketTest, Pli) { + Pli pli; + pli.From(kSenderSsrc); + pli.To(kRemoteSsrc); + + RawPacket packet = pli.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.pli()->num_packets()); + EXPECT_EQ(kSenderSsrc, parser.pli()->Ssrc()); + EXPECT_EQ(kRemoteSsrc, parser.pli()->MediaSsrc()); +} + +TEST(RtcpPacketTest, Sli) { + const uint16_t kFirstMb = 7777; + const uint16_t kNumberOfMb = 6666; + const uint8_t kPictureId = 60; + Sli sli; + sli.From(kSenderSsrc); + sli.To(kRemoteSsrc); + sli.WithFirstMb(kFirstMb); + sli.WithNumberOfMb(kNumberOfMb); + sli.WithPictureId(kPictureId); + + RawPacket packet = sli.Build(); + RtcpPacketParser parser; + parser.Parse(packet.buffer(), packet.buffer_length()); + EXPECT_EQ(1, parser.sli()->num_packets()); + EXPECT_EQ(kSenderSsrc, parser.sli()->Ssrc()); + EXPECT_EQ(kRemoteSsrc, parser.sli()->MediaSsrc()); + EXPECT_EQ(1, parser.sli_item()->num_packets()); + EXPECT_EQ(kFirstMb, parser.sli_item()->FirstMb()); + EXPECT_EQ(kNumberOfMb, parser.sli_item()->NumberOfMb()); + EXPECT_EQ(kPictureId, parser.sli_item()->PictureId()); +} + TEST(RtcpPacketTest, Nack) { Nack nack; const uint16_t kList[] = {0, 1, 3, 8, 16}; @@ -373,11 +536,11 @@ TEST(RtcpPacketTest, BuildWithInputBuffer) { rr.WithReportBlock(&rb); rr.Append(&fir); - const uint16_t kRrLength = 8; - const uint16_t kReportBlockLength = 24; - const uint16_t kFirLength = 20; + const size_t kRrLength = 8; + const size_t kReportBlockLength = 24; + const size_t kFirLength = 20; - uint16_t len = 0; + size_t len = 0; uint8_t packet[kRrLength + kReportBlockLength + kFirLength]; rr.Build(packet, &len, kRrLength + kReportBlockLength + kFirLength); @@ -394,16 +557,16 @@ TEST(RtcpPacketTest, BuildWithTooSmallBuffer) { rr.From(kSenderSsrc); rr.WithReportBlock(&rb); - const uint16_t kRrLength = 8; - const uint16_t kReportBlockLength = 24; + const size_t kRrLength = 8; + const size_t kReportBlockLength = 24; // No packet. - uint16_t len = 0; + size_t len = 0; uint8_t packet[kRrLength + kReportBlockLength - 1]; rr.Build(packet, &len, kRrLength + kReportBlockLength - 1); RtcpPacketParser parser; parser.Parse(packet, len); - EXPECT_EQ(0, len); + EXPECT_EQ(0U, len); } TEST(RtcpPacketTest, BuildWithTooSmallBuffer_LastBlockFits) { @@ -414,10 +577,10 @@ TEST(RtcpPacketTest, BuildWithTooSmallBuffer_LastBlockFits) { rr.WithReportBlock(&rb); rr.Append(&fir); - const uint16_t kRrLength = 8; - const uint16_t kReportBlockLength = 24; + const size_t kRrLength = 8; + const size_t kReportBlockLength = 24; - uint16_t len = 0; + size_t len = 0; uint8_t packet[kRrLength + kReportBlockLength - 1]; rr.Build(packet, &len, kRrLength + kReportBlockLength - 1); RtcpPacketParser parser; diff --git a/modules/video_capture/OWNERS b/modules/video_capture/OWNERS index 7798bd84..fdc2a3ff 100644 --- a/modules/video_capture/OWNERS +++ b/modules/video_capture/OWNERS @@ -1,9 +1,12 @@ fischman@webrtc.org +glaznev@webrtc.org mallinath@webrtc.org mflodman@webrtc.org perkj@webrtc.org wu@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java index e8a2fc1f..c8abdbe3 100644 --- a/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java +++ b/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java @@ -15,6 +15,7 @@ import java.util.Locale; import java.util.concurrent.Exchanger; import java.util.concurrent.locks.ReentrantLock; +import android.content.Context; import android.graphics.ImageFormat; import android.graphics.PixelFormat; import android.graphics.Rect; @@ -25,6 +26,7 @@ import android.hardware.Camera; import android.os.Handler; import android.os.Looper; import android.util.Log; +import android.view.OrientationEventListener; import android.view.SurfaceHolder.Callback; import android.view.SurfaceHolder; @@ -46,6 +48,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback { private Handler cameraThreadHandler; private final int id; private final Camera.CameraInfo info; + private final OrientationEventListener orientationListener; private final long native_capturer; // |VideoCaptureAndroid*| in C++. private SurfaceTexture dummySurfaceTexture; // Arbitrary queue depth. Higher number means more memory allocated & held, @@ -66,8 +69,30 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback { this.native_capturer = native_capturer; this.info = new Camera.CameraInfo(); Camera.getCameraInfo(id, info); + + // Must be the last thing in the ctor since we pass a reference to |this|! + final VideoCaptureAndroid self = this; + orientationListener = new OrientationEventListener(GetContext()) { + @Override public void onOrientationChanged(int degrees) { + if (degrees == OrientationEventListener.ORIENTATION_UNKNOWN) { + return; + } + if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { + degrees = (info.orientation - degrees + 360) % 360; + } else { // back-facing + degrees = (info.orientation + degrees) % 360; + } + self.OnOrientationChanged(self.native_capturer, degrees); + } + }; + // Don't add any code here; see the comment above |self| above! } + // Return the global application context. + private static native Context GetContext(); + // Request frame rotation post-capture. + private native void OnOrientationChanged(long captureObject, int degrees); + private class CameraThread extends Thread { private Exchanger<Handler> handlerExchanger; public CameraThread(Exchanger<Handler> handlerExchanger) { @@ -96,6 +121,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback { cameraThread = new CameraThread(handlerExchanger); cameraThread.start(); cameraThreadHandler = exchange(handlerExchanger, null); + orientationListener.enable(); final Exchanger<Boolean> result = new Exchanger<Boolean>(); cameraThreadHandler.post(new Runnable() { @@ -186,6 +212,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback { } cameraThreadHandler = null; cameraThread = null; + orientationListener.disable(); return status; } diff --git a/modules/video_capture/android/video_capture_android.cc b/modules/video_capture/android/video_capture_android.cc index f42329e3..c9aa52ce 100644 --- a/modules/video_capture/android/video_capture_android.cc +++ b/modules/video_capture/android/video_capture_android.cc @@ -10,6 +10,7 @@ #include "webrtc/modules/video_capture/android/video_capture_android.h" +#include "webrtc/base/common.h" #include "webrtc/modules/utility/interface/helpers_android.h" #include "webrtc/modules/video_capture/android/device_info_android.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" @@ -19,9 +20,16 @@ static JavaVM* g_jvm = NULL; static jclass g_java_capturer_class = NULL; // VideoCaptureAndroid.class. +static jobject g_context = NULL; // Owned android.content.Context. namespace webrtc { +// Called by Java to get the global application context. +jobject JNICALL GetContext(JNIEnv* env, jclass) { + assert(g_context); + return g_context; +} + // Called by Java when the camera has a new frame to deliver. void JNICALL ProvideCameraFrame( JNIEnv* env, @@ -38,11 +46,32 @@ void JNICALL ProvideCameraFrame( env->ReleaseByteArrayElements(javaCameraFrame, cameraFrame, JNI_ABORT); } -int32_t SetCaptureAndroidVM(JavaVM* javaVM) { +// Called by Java when the device orientation has changed. +void JNICALL OnOrientationChanged( + JNIEnv* env, jobject, jlong context, jint degrees) { + webrtc::videocapturemodule::VideoCaptureAndroid* captureModule = + reinterpret_cast<webrtc::videocapturemodule::VideoCaptureAndroid*>( + context); + degrees = (360 + degrees) % 360; + assert(degrees >= 0 && degrees < 360); + VideoCaptureRotation rotation = + (degrees <= 45 || degrees > 315) ? kCameraRotate0 : + (degrees > 45 && degrees <= 135) ? kCameraRotate90 : + (degrees > 135 && degrees <= 225) ? kCameraRotate180 : + (degrees > 225 && degrees <= 315) ? kCameraRotate270 : + kCameraRotate0; // Impossible. + int32_t status = + captureModule->VideoCaptureImpl::SetCaptureRotation(rotation); + RTC_UNUSED(status); + assert(status == 0); +} + +int32_t SetCaptureAndroidVM(JavaVM* javaVM, jobject context) { if (javaVM) { assert(!g_jvm); g_jvm = javaVM; AttachThreadScoped ats(g_jvm); + g_context = ats.env()->NewGlobalRef(context); videocapturemodule::DeviceInfoAndroid::Initialize(ats.env()); @@ -53,12 +82,18 @@ int32_t SetCaptureAndroidVM(JavaVM* javaVM) { reinterpret_cast<jclass>(ats.env()->NewGlobalRef(j_capture_class)); assert(g_java_capturer_class); - JNINativeMethod native_method = { - "ProvideCameraFrame", "([BIJ)V", - reinterpret_cast<void*>(&ProvideCameraFrame) - }; + JNINativeMethod native_methods[] = { + {"GetContext", + "()Landroid/content/Context;", + reinterpret_cast<void*>(&GetContext)}, + {"OnOrientationChanged", + "(JI)V", + reinterpret_cast<void*>(&OnOrientationChanged)}, + {"ProvideCameraFrame", + "([BIJ)V", + reinterpret_cast<void*>(&ProvideCameraFrame)}}; if (ats.env()->RegisterNatives(g_java_capturer_class, - &native_method, 1) != 0) + native_methods, 3) != 0) assert(false); } else { if (g_jvm) { @@ -66,6 +101,8 @@ int32_t SetCaptureAndroidVM(JavaVM* javaVM) { ats.env()->UnregisterNatives(g_java_capturer_class); ats.env()->DeleteGlobalRef(g_java_capturer_class); g_java_capturer_class = NULL; + ats.env()->DeleteGlobalRef(g_context); + g_context = NULL; videocapturemodule::DeviceInfoAndroid::DeInitialize(); g_jvm = NULL; } @@ -198,8 +235,9 @@ int32_t VideoCaptureAndroid::CaptureSettings( int32_t VideoCaptureAndroid::SetCaptureRotation( VideoCaptureRotation rotation) { CriticalSectionScoped cs(&_apiCs); - if (VideoCaptureImpl::SetCaptureRotation(rotation) != 0) - return 0; + int32_t status = VideoCaptureImpl::SetCaptureRotation(rotation); + if (status != 0) + return status; AttachThreadScoped ats(g_jvm); JNIEnv* env = ats.env(); diff --git a/modules/video_capture/ensure_initialized.cc b/modules/video_capture/ensure_initialized.cc index 995202df..65c9a8db 100644 --- a/modules/video_capture/ensure_initialized.cc +++ b/modules/video_capture/ensure_initialized.cc @@ -36,7 +36,7 @@ void EnsureInitialized() {} namespace webrtc { // Declared in webrtc/modules/video_capture/include/video_capture.h. -int32_t SetCaptureAndroidVM(JavaVM* javaVM); +int32_t SetCaptureAndroidVM(JavaVM* javaVM, jobject g_context); namespace videocapturemodule { @@ -44,10 +44,11 @@ static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; void EnsureInitializedOnce() { JNIEnv* jni = ::base::android::AttachCurrentThread(); + jobject context = ::base::android::GetApplicationContext(); JavaVM* jvm = NULL; int status = jni->GetJavaVM(&jvm); ASSERT(status == 0); - status = webrtc::SetCaptureAndroidVM(jvm) == 0; + status = webrtc::SetCaptureAndroidVM(jvm, context) == 0; ASSERT(status); } diff --git a/modules/video_capture/include/video_capture.h b/modules/video_capture/include/video_capture.h index 6966c238..7398af60 100644 --- a/modules/video_capture/include/video_capture.h +++ b/modules/video_capture/include/video_capture.h @@ -21,7 +21,7 @@ namespace webrtc { #if defined(ANDROID) -int32_t SetCaptureAndroidVM(JavaVM* javaVM); +int32_t SetCaptureAndroidVM(JavaVM* javaVM, jobject context); #endif class VideoCaptureModule: public RefCountedModule { diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc index d413f504..6f179e2d 100644 --- a/modules/video_capture/video_capture_impl.cc +++ b/modules/video_capture/video_capture_impl.cc @@ -260,7 +260,8 @@ int32_t VideoCaptureImpl::IncomingFrame( const VideoCaptureCapability& frameInfo, int64_t captureTime/*=0*/) { - CriticalSectionScoped cs(&_callBackCs); + CriticalSectionScoped cs(&_apiCs); + CriticalSectionScoped cs2(&_callBackCs); const int32_t width = frameInfo.width; const int32_t height = frameInfo.height; @@ -332,7 +333,8 @@ int32_t VideoCaptureImpl::IncomingFrame( int32_t VideoCaptureImpl::IncomingI420VideoFrame(I420VideoFrame* video_frame, int64_t captureTime) { - CriticalSectionScoped cs(&_callBackCs); + CriticalSectionScoped cs(&_apiCs); + CriticalSectionScoped cs2(&_callBackCs); DeliverCapturedFrame(*video_frame, captureTime); return 0; diff --git a/modules/video_capture/video_capture_tests.isolate b/modules/video_capture/video_capture_tests.isolate index 30374ce4..57dd6673 100644 --- a/modules/video_capture/video_capture_tests.isolate +++ b/modules/video_capture/video_capture_tests.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../../data/', - '../../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/modules/video_capture_module.target.darwin-arm.mk b/modules/video_capture_module.target.darwin-arm.mk index 2c585986..2ce68b72 100644 --- a/modules/video_capture_module.target.darwin-arm.mk +++ b/modules/video_capture_module.target.darwin-arm.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -129,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -210,6 +212,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -250,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.darwin-arm64.mk b/modules/video_capture_module.target.darwin-arm64.mk index 2d195dd9..b95713d7 100644 --- a/modules/video_capture_module.target.darwin-arm64.mk +++ b/modules/video_capture_module.target.darwin-arm64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -186,6 +188,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -223,6 +226,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.darwin-mips.mk b/modules/video_capture_module.target.darwin-mips.mk index 6e5a2756..c65396c8 100644 --- a/modules/video_capture_module.target.darwin-mips.mk +++ b/modules/video_capture_module.target.darwin-mips.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -124,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -201,6 +203,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -240,6 +243,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.darwin-x86.mk b/modules/video_capture_module.target.darwin-x86.mk index cdfd8b75..f62c716c 100644 --- a/modules/video_capture_module.target.darwin-x86.mk +++ b/modules/video_capture_module.target.darwin-x86.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -233,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.darwin-x86_64.mk b/modules/video_capture_module.target.darwin-x86_64.mk index 2a3c660d..ae511a0a 100644 --- a/modules/video_capture_module.target.darwin-x86_64.mk +++ b/modules/video_capture_module.target.darwin-x86_64.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.linux-arm.mk b/modules/video_capture_module.target.linux-arm.mk index 2c585986..2ce68b72 100644 --- a/modules/video_capture_module.target.linux-arm.mk +++ b/modules/video_capture_module.target.linux-arm.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -129,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -210,6 +212,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -250,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.linux-arm64.mk b/modules/video_capture_module.target.linux-arm64.mk index 2d195dd9..b95713d7 100644 --- a/modules/video_capture_module.target.linux-arm64.mk +++ b/modules/video_capture_module.target.linux-arm64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -186,6 +188,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -223,6 +226,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.linux-mips.mk b/modules/video_capture_module.target.linux-mips.mk index 6e5a2756..c65396c8 100644 --- a/modules/video_capture_module.target.linux-mips.mk +++ b/modules/video_capture_module.target.linux-mips.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -124,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -201,6 +203,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -240,6 +243,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.linux-x86.mk b/modules/video_capture_module.target.linux-x86.mk index cdfd8b75..f62c716c 100644 --- a/modules/video_capture_module.target.linux-x86.mk +++ b/modules/video_capture_module.target.linux-x86.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -233,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_capture_module.target.linux-x86_64.mk b/modules/video_capture_module.target.linux-x86_64.mk index 2a3c660d..ae511a0a 100644 --- a/modules/video_capture_module.target.linux-x86_64.mk +++ b/modules/video_capture_module.target.linux-x86_64.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk index 823475b0..7050b1cf 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -203,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -243,6 +246,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk index ff679677..0cfc3ab2 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -179,6 +181,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -216,6 +219,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk index 5d1603bc..570eb312 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk index 505b3b1d..27b1c3a2 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk index 27f5ee08..c7fc9be8 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -187,6 +189,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -224,6 +227,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk index 823475b0..7050b1cf 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -203,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -243,6 +246,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk index ff679677..0cfc3ab2 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -179,6 +181,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -216,6 +219,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk index 5d1603bc..570eb312 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -192,6 +194,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk index 505b3b1d..27b1c3a2 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk index 27f5ee08..c7fc9be8 100644 --- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk +++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -187,6 +189,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -224,6 +227,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk index 78a65b6c..b3ddd7f1 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -122,6 +123,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -197,6 +199,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -237,6 +240,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk index dd082336..c14e11a1 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk @@ -73,6 +73,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -109,6 +110,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -173,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -210,6 +213,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk index 10dee642..bfd617f2 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -186,6 +188,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk index cbb8af19..1e410032 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -183,6 +185,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -220,6 +223,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk index f126471c..44aa4f90 100644 --- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk index 78a65b6c..b3ddd7f1 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -122,6 +123,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -197,6 +199,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -237,6 +240,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk index dd082336..c14e11a1 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk @@ -73,6 +73,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -109,6 +110,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -173,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -210,6 +213,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk index 10dee642..bfd617f2 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -186,6 +188,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk index cbb8af19..1e410032 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -183,6 +185,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -220,6 +223,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk index f126471c..44aa4f90 100644 --- a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk +++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.darwin-arm.mk b/modules/video_processing.target.darwin-arm.mk index d3af15bb..8cd6c3b3 100644 --- a/modules/video_processing.target.darwin-arm.mk +++ b/modules/video_processing.target.darwin-arm.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -134,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -258,6 +261,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.darwin-arm64.mk b/modules/video_processing.target.darwin-arm64.mk index 7f803a82..8da8b99c 100644 --- a/modules/video_processing.target.darwin-arm64.mk +++ b/modules/video_processing.target.darwin-arm64.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.darwin-mips.mk b/modules/video_processing.target.darwin-mips.mk index 2a421418..5b64e822 100644 --- a/modules/video_processing.target.darwin-mips.mk +++ b/modules/video_processing.target.darwin-mips.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -129,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.darwin-x86.mk b/modules/video_processing.target.darwin-x86.mk index c50431ac..e1c8322c 100644 --- a/modules/video_processing.target.darwin-x86.mk +++ b/modules/video_processing.target.darwin-x86.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.darwin-x86_64.mk b/modules/video_processing.target.darwin-x86_64.mk index f3e2000c..257fe31e 100644 --- a/modules/video_processing.target.darwin-x86_64.mk +++ b/modules/video_processing.target.darwin-x86_64.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -202,6 +204,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -239,6 +242,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.linux-arm.mk b/modules/video_processing.target.linux-arm.mk index d3af15bb..8cd6c3b3 100644 --- a/modules/video_processing.target.linux-arm.mk +++ b/modules/video_processing.target.linux-arm.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -134,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -218,6 +220,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -258,6 +261,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.linux-arm64.mk b/modules/video_processing.target.linux-arm64.mk index 7f803a82..8da8b99c 100644 --- a/modules/video_processing.target.linux-arm64.mk +++ b/modules/video_processing.target.linux-arm64.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -231,6 +234,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.linux-mips.mk b/modules/video_processing.target.linux-mips.mk index 2a421418..5b64e822 100644 --- a/modules/video_processing.target.linux-mips.mk +++ b/modules/video_processing.target.linux-mips.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -129,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.linux-x86.mk b/modules/video_processing.target.linux-x86.mk index c50431ac..e1c8322c 100644 --- a/modules/video_processing.target.linux-x86.mk +++ b/modules/video_processing.target.linux-x86.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing.target.linux-x86_64.mk b/modules/video_processing.target.linux-x86_64.mk index f3e2000c..257fe31e 100644 --- a/modules/video_processing.target.linux-x86_64.mk +++ b/modules/video_processing.target.linux-x86_64.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -202,6 +204,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -239,6 +242,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing_sse2.target.darwin-x86.mk b/modules/video_processing_sse2.target.darwin-x86.mk index 488330c4..b8287a8e 100644 --- a/modules/video_processing_sse2.target.darwin-x86.mk +++ b/modules/video_processing_sse2.target.darwin-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing_sse2.target.darwin-x86_64.mk b/modules/video_processing_sse2.target.darwin-x86_64.mk index 5ace3af8..2aae9934 100644 --- a/modules/video_processing_sse2.target.darwin-x86_64.mk +++ b/modules/video_processing_sse2.target.darwin-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing_sse2.target.linux-x86.mk b/modules/video_processing_sse2.target.linux-x86.mk index 488330c4..b8287a8e 100644 --- a/modules/video_processing_sse2.target.linux-x86.mk +++ b/modules/video_processing_sse2.target.linux-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -191,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_processing_sse2.target.linux-x86_64.mk b/modules/video_processing_sse2.target.linux-x86_64.mk index 5ace3af8..2aae9934 100644 --- a/modules/video_processing_sse2.target.linux-x86_64.mk +++ b/modules/video_processing_sse2.target.linux-x86_64.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -189,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -226,6 +229,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render/OWNERS b/modules/video_render/OWNERS index 19fb6760..7dd4a362 100644 --- a/modules/video_render/OWNERS +++ b/modules/video_render/OWNERS @@ -4,6 +4,8 @@ perkj@webrtc.org wu@webrtc.org mallinath@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/modules/video_render/video_render_tests.isolate b/modules/video_render/video_render_tests.isolate index 397ec04e..15c80141 100644 --- a/modules/video_render/video_render_tests.isolate +++ b/modules/video_render/video_render_tests.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../../data/', - '../../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/modules/video_render_module.target.darwin-arm.mk b/modules/video_render_module.target.darwin-arm.mk index abaebd4c..00ddc8df 100644 --- a/modules/video_render_module.target.darwin-arm.mk +++ b/modules/video_render_module.target.darwin-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -128,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.darwin-arm64.mk b/modules/video_render_module.target.darwin-arm64.mk index 7eb76870..000ec7f6 100644 --- a/modules/video_render_module.target.darwin-arm64.mk +++ b/modules/video_render_module.target.darwin-arm64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -185,6 +187,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.darwin-mips.mk b/modules/video_render_module.target.darwin-mips.mk index ca73ec2e..d01e5a95 100644 --- a/modules/video_render_module.target.darwin-mips.mk +++ b/modules/video_render_module.target.darwin-mips.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -200,6 +202,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -239,6 +242,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.darwin-x86.mk b/modules/video_render_module.target.darwin-x86.mk index b47cac4a..c5797f78 100644 --- a/modules/video_render_module.target.darwin-x86.mk +++ b/modules/video_render_module.target.darwin-x86.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -232,6 +235,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.darwin-x86_64.mk b/modules/video_render_module.target.darwin-x86_64.mk index 79a9110c..88ef855d 100644 --- a/modules/video_render_module.target.darwin-x86_64.mk +++ b/modules/video_render_module.target.darwin-x86_64.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -193,6 +195,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -230,6 +233,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.linux-arm.mk b/modules/video_render_module.target.linux-arm.mk index abaebd4c..00ddc8df 100644 --- a/modules/video_render_module.target.linux-arm.mk +++ b/modules/video_render_module.target.linux-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -128,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.linux-arm64.mk b/modules/video_render_module.target.linux-arm64.mk index 7eb76870..000ec7f6 100644 --- a/modules/video_render_module.target.linux-arm64.mk +++ b/modules/video_render_module.target.linux-arm64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -185,6 +187,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.linux-mips.mk b/modules/video_render_module.target.linux-mips.mk index ca73ec2e..d01e5a95 100644 --- a/modules/video_render_module.target.linux-mips.mk +++ b/modules/video_render_module.target.linux-mips.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -123,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -200,6 +202,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -239,6 +242,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.linux-x86.mk b/modules/video_render_module.target.linux-x86.mk index b47cac4a..c5797f78 100644 --- a/modules/video_render_module.target.linux-x86.mk +++ b/modules/video_render_module.target.linux-x86.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -232,6 +235,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/video_render_module.target.linux-x86_64.mk b/modules/video_render_module.target.linux-x86_64.mk index 79a9110c..88ef855d 100644 --- a/modules/video_render_module.target.linux-x86_64.mk +++ b/modules/video_render_module.target.linux-x86_64.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -193,6 +195,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -230,6 +233,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.darwin-arm.mk b/modules/webrtc_i420.target.darwin-arm.mk index 113b7f37..ce889dff 100644 --- a/modules/webrtc_i420.target.darwin-arm.mk +++ b/modules/webrtc_i420.target.darwin-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.darwin-arm64.mk b/modules/webrtc_i420.target.darwin-arm64.mk index e041a6b1..539fb98b 100644 --- a/modules/webrtc_i420.target.darwin-arm64.mk +++ b/modules/webrtc_i420.target.darwin-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.darwin-mips.mk b/modules/webrtc_i420.target.darwin-mips.mk index f7d11297..43a7a15f 100644 --- a/modules/webrtc_i420.target.darwin-mips.mk +++ b/modules/webrtc_i420.target.darwin-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.darwin-x86.mk b/modules/webrtc_i420.target.darwin-x86.mk index 03c46eb6..8533400e 100644 --- a/modules/webrtc_i420.target.darwin-x86.mk +++ b/modules/webrtc_i420.target.darwin-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.darwin-x86_64.mk b/modules/webrtc_i420.target.darwin-x86_64.mk index 113ba5e1..6ac95fa3 100644 --- a/modules/webrtc_i420.target.darwin-x86_64.mk +++ b/modules/webrtc_i420.target.darwin-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.linux-arm.mk b/modules/webrtc_i420.target.linux-arm.mk index 113b7f37..ce889dff 100644 --- a/modules/webrtc_i420.target.linux-arm.mk +++ b/modules/webrtc_i420.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.linux-arm64.mk b/modules/webrtc_i420.target.linux-arm64.mk index e041a6b1..539fb98b 100644 --- a/modules/webrtc_i420.target.linux-arm64.mk +++ b/modules/webrtc_i420.target.linux-arm64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.linux-mips.mk b/modules/webrtc_i420.target.linux-mips.mk index f7d11297..43a7a15f 100644 --- a/modules/webrtc_i420.target.linux-mips.mk +++ b/modules/webrtc_i420.target.linux-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.linux-x86.mk b/modules/webrtc_i420.target.linux-x86.mk index 03c46eb6..8533400e 100644 --- a/modules/webrtc_i420.target.linux-x86.mk +++ b/modules/webrtc_i420.target.linux-x86.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -117,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_i420.target.linux-x86_64.mk b/modules/webrtc_i420.target.linux-x86_64.mk index 113ba5e1..6ac95fa3 100644 --- a/modules/webrtc_i420.target.linux-x86_64.mk +++ b/modules/webrtc_i420.target.linux-x86_64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.darwin-arm.mk b/modules/webrtc_opus.target.darwin-arm.mk index e634ec20..f8ab0b6d 100644 --- a/modules/webrtc_opus.target.darwin-arm.mk +++ b/modules/webrtc_opus.target.darwin-arm.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -124,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.darwin-arm64.mk b/modules/webrtc_opus.target.darwin-arm64.mk index bbc2f62d..24335c11 100644 --- a/modules/webrtc_opus.target.darwin-arm64.mk +++ b/modules/webrtc_opus.target.darwin-arm64.mk @@ -75,6 +75,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -111,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.darwin-mips.mk b/modules/webrtc_opus.target.darwin-mips.mk index d4edaecd..c281e3f1 100644 --- a/modules/webrtc_opus.target.darwin-mips.mk +++ b/modules/webrtc_opus.target.darwin-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.darwin-x86.mk b/modules/webrtc_opus.target.darwin-x86.mk index de00d0f5..7f2bd865 100644 --- a/modules/webrtc_opus.target.darwin-x86.mk +++ b/modules/webrtc_opus.target.darwin-x86.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.darwin-x86_64.mk b/modules/webrtc_opus.target.darwin-x86_64.mk index 0a2f235b..267cd535 100644 --- a/modules/webrtc_opus.target.darwin-x86_64.mk +++ b/modules/webrtc_opus.target.darwin-x86_64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.linux-arm.mk b/modules/webrtc_opus.target.linux-arm.mk index e634ec20..f8ab0b6d 100644 --- a/modules/webrtc_opus.target.linux-arm.mk +++ b/modules/webrtc_opus.target.linux-arm.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -124,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -244,6 +247,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.linux-arm64.mk b/modules/webrtc_opus.target.linux-arm64.mk index bbc2f62d..24335c11 100644 --- a/modules/webrtc_opus.target.linux-arm64.mk +++ b/modules/webrtc_opus.target.linux-arm64.mk @@ -75,6 +75,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -111,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.linux-mips.mk b/modules/webrtc_opus.target.linux-mips.mk index d4edaecd..c281e3f1 100644 --- a/modules/webrtc_opus.target.linux-mips.mk +++ b/modules/webrtc_opus.target.linux-mips.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.linux-x86.mk b/modules/webrtc_opus.target.linux-x86.mk index de00d0f5..7f2bd865 100644 --- a/modules/webrtc_opus.target.linux-x86.mk +++ b/modules/webrtc_opus.target.linux-x86.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -116,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -227,6 +230,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_opus.target.linux-x86_64.mk b/modules/webrtc_opus.target.linux-x86_64.mk index 0a2f235b..267cd535 100644 --- a/modules/webrtc_opus.target.linux-x86_64.mk +++ b/modules/webrtc_opus.target.linux-x86_64.mk @@ -79,6 +79,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -188,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -225,6 +228,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.darwin-arm.mk b/modules/webrtc_utility.target.darwin-arm.mk index 66940f63..9482c505 100644 --- a/modules/webrtc_utility.target.darwin-arm.mk +++ b/modules/webrtc_utility.target.darwin-arm.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -134,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -220,6 +222,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -260,6 +263,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.darwin-arm64.mk b/modules/webrtc_utility.target.darwin-arm64.mk index 383c5cd2..cf53ddbc 100644 --- a/modules/webrtc_utility.target.darwin-arm64.mk +++ b/modules/webrtc_utility.target.darwin-arm64.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -233,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.darwin-mips.mk b/modules/webrtc_utility.target.darwin-mips.mk index b28f6e5d..9c64aabb 100644 --- a/modules/webrtc_utility.target.darwin-mips.mk +++ b/modules/webrtc_utility.target.darwin-mips.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -129,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -211,6 +213,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -250,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.darwin-x86.mk b/modules/webrtc_utility.target.darwin-x86.mk index 40b8730e..5e92212c 100644 --- a/modules/webrtc_utility.target.darwin-x86.mk +++ b/modules/webrtc_utility.target.darwin-x86.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -206,6 +208,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -243,6 +246,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.darwin-x86_64.mk b/modules/webrtc_utility.target.darwin-x86_64.mk index a3ace7d7..ab94f406 100644 --- a/modules/webrtc_utility.target.darwin-x86_64.mk +++ b/modules/webrtc_utility.target.darwin-x86_64.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.linux-arm.mk b/modules/webrtc_utility.target.linux-arm.mk index 66940f63..9482c505 100644 --- a/modules/webrtc_utility.target.linux-arm.mk +++ b/modules/webrtc_utility.target.linux-arm.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -134,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -220,6 +222,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -260,6 +263,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.linux-arm64.mk b/modules/webrtc_utility.target.linux-arm64.mk index 383c5cd2..cf53ddbc 100644 --- a/modules/webrtc_utility.target.linux-arm64.mk +++ b/modules/webrtc_utility.target.linux-arm64.mk @@ -85,6 +85,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -196,6 +198,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -233,6 +236,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.linux-mips.mk b/modules/webrtc_utility.target.linux-mips.mk index b28f6e5d..9c64aabb 100644 --- a/modules/webrtc_utility.target.linux-mips.mk +++ b/modules/webrtc_utility.target.linux-mips.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -129,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -211,6 +213,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -250,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.linux-x86.mk b/modules/webrtc_utility.target.linux-x86.mk index 40b8730e..5e92212c 100644 --- a/modules/webrtc_utility.target.linux-x86.mk +++ b/modules/webrtc_utility.target.linux-x86.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -126,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -206,6 +208,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -243,6 +246,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_utility.target.linux-x86_64.mk b/modules/webrtc_utility.target.linux-x86_64.mk index a3ace7d7..ab94f406 100644 --- a/modules/webrtc_utility.target.linux-x86_64.mk +++ b/modules/webrtc_utility.target.linux-x86_64.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -125,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.darwin-arm.mk b/modules/webrtc_video_coding.target.darwin-arm.mk index 9bc92925..854686e4 100644 --- a/modules/webrtc_video_coding.target.darwin-arm.mk +++ b/modules/webrtc_video_coding.target.darwin-arm.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -147,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -268,6 +271,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.darwin-arm64.mk b/modules/webrtc_video_coding.target.darwin-arm64.mk index 1f110c03..cbd8f740 100644 --- a/modules/webrtc_video_coding.target.darwin-arm64.mk +++ b/modules/webrtc_video_coding.target.darwin-arm64.mk @@ -98,6 +98,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -134,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.darwin-mips.mk b/modules/webrtc_video_coding.target.darwin-mips.mk index 89b1e0ea..93ccba9c 100644 --- a/modules/webrtc_video_coding.target.darwin-mips.mk +++ b/modules/webrtc_video_coding.target.darwin-mips.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -142,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -258,6 +261,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.darwin-x86.mk b/modules/webrtc_video_coding.target.darwin-x86.mk index 8272c746..c1cb7d8a 100644 --- a/modules/webrtc_video_coding.target.darwin-x86.mk +++ b/modules/webrtc_video_coding.target.darwin-x86.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -139,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -214,6 +216,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -251,6 +254,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.darwin-x86_64.mk b/modules/webrtc_video_coding.target.darwin-x86_64.mk index 7d85a63d..f4bec2c8 100644 --- a/modules/webrtc_video_coding.target.darwin-x86_64.mk +++ b/modules/webrtc_video_coding.target.darwin-x86_64.mk @@ -102,6 +102,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -138,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -212,6 +214,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.linux-arm.mk b/modules/webrtc_video_coding.target.linux-arm.mk index 9bc92925..854686e4 100644 --- a/modules/webrtc_video_coding.target.linux-arm.mk +++ b/modules/webrtc_video_coding.target.linux-arm.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -147,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -268,6 +271,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.linux-arm64.mk b/modules/webrtc_video_coding.target.linux-arm64.mk index 1f110c03..cbd8f740 100644 --- a/modules/webrtc_video_coding.target.linux-arm64.mk +++ b/modules/webrtc_video_coding.target.linux-arm64.mk @@ -98,6 +98,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -134,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.linux-mips.mk b/modules/webrtc_video_coding.target.linux-mips.mk index 89b1e0ea..93ccba9c 100644 --- a/modules/webrtc_video_coding.target.linux-mips.mk +++ b/modules/webrtc_video_coding.target.linux-mips.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -142,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -258,6 +261,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.linux-x86.mk b/modules/webrtc_video_coding.target.linux-x86.mk index 8272c746..c1cb7d8a 100644 --- a/modules/webrtc_video_coding.target.linux-x86.mk +++ b/modules/webrtc_video_coding.target.linux-x86.mk @@ -103,6 +103,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -139,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -214,6 +216,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -251,6 +254,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/modules/webrtc_video_coding.target.linux-x86_64.mk b/modules/webrtc_video_coding.target.linux-x86_64.mk index 7d85a63d..f4bec2c8 100644 --- a/modules/webrtc_video_coding.target.linux-x86_64.mk +++ b/modules/webrtc_video_coding.target.linux-x86_64.mk @@ -102,6 +102,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -138,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -212,6 +214,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/interface/clock.h b/system_wrappers/interface/clock.h index 38ce0d58..c03f976d 100644 --- a/system_wrappers/interface/clock.h +++ b/system_wrappers/interface/clock.h @@ -32,17 +32,17 @@ class Clock { // Return a timestamp in milliseconds relative to some arbitrary source; the // source is fixed for this clock. - virtual int64_t TimeInMilliseconds() = 0; + virtual int64_t TimeInMilliseconds() const = 0; // Return a timestamp in microseconds relative to some arbitrary source; the // source is fixed for this clock. - virtual int64_t TimeInMicroseconds() = 0; + virtual int64_t TimeInMicroseconds() const = 0; // Retrieve an NTP absolute timestamp in seconds and fractions of a second. - virtual void CurrentNtp(uint32_t& seconds, uint32_t& fractions) = 0; + virtual void CurrentNtp(uint32_t& seconds, uint32_t& fractions) const = 0; // Retrieve an NTP absolute timestamp in milliseconds. - virtual int64_t CurrentNtpInMilliseconds() = 0; + virtual int64_t CurrentNtpInMilliseconds() const = 0; // Converts an NTP timestamp to a millisecond timestamp. static int64_t NtpToMs(uint32_t seconds, uint32_t fractions); @@ -59,17 +59,18 @@ class SimulatedClock : public Clock { // Return a timestamp in milliseconds relative to some arbitrary source; the // source is fixed for this clock. - virtual int64_t TimeInMilliseconds() OVERRIDE; + virtual int64_t TimeInMilliseconds() const OVERRIDE; // Return a timestamp in microseconds relative to some arbitrary source; the // source is fixed for this clock. - virtual int64_t TimeInMicroseconds() OVERRIDE; + virtual int64_t TimeInMicroseconds() const OVERRIDE; // Retrieve an NTP absolute timestamp in milliseconds. - virtual void CurrentNtp(uint32_t& seconds, uint32_t& fractions) OVERRIDE; + virtual void CurrentNtp(uint32_t& seconds, + uint32_t& fractions) const OVERRIDE; // Converts an NTP timestamp to a millisecond timestamp. - virtual int64_t CurrentNtpInMilliseconds() OVERRIDE; + virtual int64_t CurrentNtpInMilliseconds() const OVERRIDE; // Advance the simulated clock with a given number of milliseconds or // microseconds. diff --git a/system_wrappers/source/OWNERS b/system_wrappers/source/OWNERS index 3ee6b4bf..bbffda7e 100644 --- a/system_wrappers/source/OWNERS +++ b/system_wrappers/source/OWNERS @@ -1,3 +1,4 @@ +per-file *.isolate=kjellander@webrtc.org # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc index aa80f8fb..33eb8561 100644 --- a/system_wrappers/source/clock.cc +++ b/system_wrappers/source/clock.cc @@ -129,18 +129,19 @@ void get_time(WindowsHelpTimer* help_timer, FILETIME& current_time) { class RealTimeClock : public Clock { // Return a timestamp in milliseconds relative to some arbitrary source; the // source is fixed for this clock. - virtual int64_t TimeInMilliseconds() OVERRIDE { + virtual int64_t TimeInMilliseconds() const OVERRIDE { return TickTime::MillisecondTimestamp(); } // Return a timestamp in microseconds relative to some arbitrary source; the // source is fixed for this clock. - virtual int64_t TimeInMicroseconds() OVERRIDE { + virtual int64_t TimeInMicroseconds() const OVERRIDE { return TickTime::MicrosecondTimestamp(); } // Retrieve an NTP absolute timestamp in seconds and fractions of a second. - virtual void CurrentNtp(uint32_t& seconds, uint32_t& fractions) OVERRIDE { + virtual void CurrentNtp(uint32_t& seconds, + uint32_t& fractions) const OVERRIDE { timeval tv = CurrentTimeVal(); double microseconds_in_seconds; Adjust(tv, &seconds, µseconds_in_seconds); @@ -149,7 +150,7 @@ class RealTimeClock : public Clock { } // Retrieve an NTP absolute timestamp in milliseconds. - virtual int64_t CurrentNtpInMilliseconds() OVERRIDE { + virtual int64_t CurrentNtpInMilliseconds() const OVERRIDE { timeval tv = CurrentTimeVal(); uint32_t seconds; double microseconds_in_seconds; @@ -270,24 +271,24 @@ SimulatedClock::SimulatedClock(int64_t initial_time_us) SimulatedClock::~SimulatedClock() { } -int64_t SimulatedClock::TimeInMilliseconds() { +int64_t SimulatedClock::TimeInMilliseconds() const { ReadLockScoped synchronize(*lock_); return (time_us_ + 500) / 1000; } -int64_t SimulatedClock::TimeInMicroseconds() { +int64_t SimulatedClock::TimeInMicroseconds() const { ReadLockScoped synchronize(*lock_); return time_us_; } -void SimulatedClock::CurrentNtp(uint32_t& seconds, uint32_t& fractions) { +void SimulatedClock::CurrentNtp(uint32_t& seconds, uint32_t& fractions) const { int64_t now_ms = TimeInMilliseconds(); seconds = (now_ms / 1000) + kNtpJan1970; fractions = static_cast<uint32_t>((now_ms % 1000) * kMagicNtpFractionalUnit / 1000); } -int64_t SimulatedClock::CurrentNtpInMilliseconds() { +int64_t SimulatedClock::CurrentNtpInMilliseconds() const { return TimeInMilliseconds() + 1000 * static_cast<int64_t>(kNtpJan1970); } diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk index cc26fe5e..ba1cce96 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk index c9e95b7e..ad355204 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk @@ -71,6 +71,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -107,6 +108,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -170,6 +172,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -207,6 +210,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk index 03121126..63d21f22 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -183,6 +185,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk index 0a3a9c6b..a5c12e8a 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk index d3cab632..a8536e93 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk @@ -75,6 +75,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -111,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -178,6 +180,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -215,6 +218,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index cc26fe5e..ba1cce96 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -81,6 +81,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -120,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -194,6 +196,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -234,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk index c9e95b7e..ad355204 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk @@ -71,6 +71,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -107,6 +108,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -170,6 +172,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -207,6 +210,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk index 03121126..63d21f22 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -183,6 +185,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk index 0a3a9c6b..a5c12e8a 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -180,6 +182,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +220,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk index d3cab632..a8536e93 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk @@ -75,6 +75,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -111,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -178,6 +180,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -215,6 +218,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index c2058606..39696846 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -157,6 +158,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -281,6 +284,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk index f04dc0ef..731eab85 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +257,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk index 8267dfeb..1aeeb631 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -151,6 +152,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -222,6 +224,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -269,6 +272,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk index 5dfc04fc..a2d3d731 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -264,6 +267,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk index 47d48a13..b9d521de 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -148,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -262,6 +265,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index c2058606..39696846 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -110,6 +110,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -157,6 +158,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -233,6 +235,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -281,6 +284,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm64.mk b/system_wrappers/source/system_wrappers.target.linux-arm64.mk index f04dc0ef..731eab85 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -209,6 +211,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -254,6 +257,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index 8267dfeb..1aeeb631 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -151,6 +152,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -222,6 +224,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -269,6 +272,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index 5dfc04fc..a2d3d731 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -149,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -219,6 +221,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -264,6 +267,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk index 47d48a13..b9d521de 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -148,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -262,6 +265,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/system_wrappers/source/system_wrappers_unittests.isolate b/system_wrappers/source/system_wrappers_unittests.isolate index 6ec5e7c6..f5057710 100644 --- a/system_wrappers/source/system_wrappers_unittests.isolate +++ b/system_wrappers/source/system_wrappers_unittests.isolate @@ -9,27 +9,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../../data/', - '../../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/test/OWNERS b/test/OWNERS index 26c74f53..1532e3fd 100644 --- a/test/OWNERS +++ b/test/OWNERS @@ -1,7 +1,7 @@ -phoglund@webrtc.org
-kjellander@webrtc.org
-ivinnichenko@webrtc.org
-
+phoglund@webrtc.org +kjellander@webrtc.org + +per-file *.isolate=kjellander@webrtc.org # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc index d02c29f9..5193be65 100644 --- a/test/encoder_settings.cc +++ b/test/encoder_settings.cc @@ -16,18 +16,14 @@ namespace webrtc { namespace test { -VideoSendStream::Config::EncoderSettings CreateEncoderSettings( - VideoEncoder* encoder, - const char* payload_name, - int payload_type, - size_t num_streams) { +std::vector<VideoStream> CreateVideoStreams(size_t num_streams) { assert(num_streams > 0); // Add more streams to the settings above with reasonable values if required. static const size_t kNumSettings = 3; assert(num_streams <= kNumSettings); - VideoStream stream_settings[kNumSettings]; + std::vector<VideoStream> stream_settings(kNumSettings); stream_settings[0].width = 320; stream_settings[0].height = 180; @@ -52,28 +48,20 @@ VideoSendStream::Config::EncoderSettings CreateEncoderSettings( stream_settings[2].target_bitrate_bps = stream_settings[2].max_bitrate_bps = 1500000; stream_settings[2].max_qp = 56; - - VideoSendStream::Config::EncoderSettings settings; - - for (size_t i = 0; i < num_streams; ++i) - settings.streams.push_back(stream_settings[i]); - - settings.encoder = encoder; - settings.payload_name = payload_name; - settings.payload_type = payload_type; - return settings; + stream_settings.resize(num_streams); + return stream_settings; } VideoCodec CreateDecoderVideoCodec( - const VideoSendStream::Config::EncoderSettings& settings) { - assert(settings.streams.size() > 0); + const VideoSendStream::Config::EncoderSettings& encoder_settings) { VideoCodec codec; memset(&codec, 0, sizeof(codec)); - codec.plType = settings.payload_type; - strcpy(codec.plName, settings.payload_name.c_str()); + codec.plType = encoder_settings.payload_type; + strcpy(codec.plName, encoder_settings.payload_name.c_str()); codec.codecType = - (settings.payload_name == "VP8" ? kVideoCodecVP8 : kVideoCodecGeneric); + (encoder_settings.payload_name == "VP8" ? kVideoCodecVP8 + : kVideoCodecGeneric); if (codec.codecType == kVideoCodecVP8) { codec.codecSpecific.VP8.resilience = kResilientStream; @@ -85,33 +73,9 @@ VideoCodec CreateDecoderVideoCodec( codec.codecSpecific.VP8.keyFrameInterval = 3000; } - codec.minBitrate = settings.streams[0].min_bitrate_bps / 1000; - for (size_t i = 0; i < settings.streams.size(); ++i) { - const VideoStream& stream = settings.streams[i]; - if (stream.width > codec.width) - codec.width = static_cast<unsigned short>(stream.width); - if (stream.height > codec.height) - codec.height = static_cast<unsigned short>(stream.height); - if (static_cast<unsigned int>(stream.min_bitrate_bps / 1000) < - codec.minBitrate) - codec.minBitrate = - static_cast<unsigned int>(stream.min_bitrate_bps / 1000); - codec.maxBitrate += stream.max_bitrate_bps / 1000; - if (static_cast<unsigned int>(stream.max_qp) > codec.qpMax) - codec.qpMax = static_cast<unsigned int>(stream.max_qp); - } - - if (codec.minBitrate < kViEMinCodecBitrate) - codec.minBitrate = kViEMinCodecBitrate; - if (codec.maxBitrate < kViEMinCodecBitrate) - codec.maxBitrate = kViEMinCodecBitrate; - - codec.startBitrate = 300; - - if (codec.startBitrate < codec.minBitrate) - codec.startBitrate = codec.minBitrate; - if (codec.startBitrate > codec.maxBitrate) - codec.startBitrate = codec.maxBitrate; + codec.width = 320; + codec.height = 180; + codec.startBitrate = codec.minBitrate = codec.maxBitrate = 300; return codec; } diff --git a/test/encoder_settings.h b/test/encoder_settings.h index 1d8e355a..ea2be977 100644 --- a/test/encoder_settings.h +++ b/test/encoder_settings.h @@ -14,14 +14,10 @@ namespace webrtc { namespace test { -VideoSendStream::Config::EncoderSettings CreateEncoderSettings( - VideoEncoder* encoder, - const char* payload_name, - int payload_type, - size_t num_streams); +std::vector<VideoStream> CreateVideoStreams(size_t num_streams); VideoCodec CreateDecoderVideoCodec( - const VideoSendStream::Config::EncoderSettings& settings); + const VideoSendStream::Config::EncoderSettings& encoder_settings); } // namespace test } // namespace webrtc diff --git a/test/rtcp_packet_parser.cc b/test/rtcp_packet_parser.cc index 9ae8543d..69c50d1b 100644 --- a/test/rtcp_packet_parser.cc +++ b/test/rtcp_packet_parser.cc @@ -30,13 +30,40 @@ void RtcpPacketParser::Parse(const void *data, int len) { case RTCPUtility::kRtcpRrCode: receiver_report_.Set(parser.Packet().RR); break; - case RTCPUtility::kRtcpByeCode: - bye_.Set(parser.Packet().BYE); - break; case RTCPUtility::kRtcpReportBlockItemCode: report_block_.Set(parser.Packet().ReportBlockItem); ++report_blocks_per_ssrc_[parser.Packet().ReportBlockItem.SSRC]; break; + case RTCPUtility::kRtcpSdesCode: + sdes_.Set(); + break; + case RTCPUtility::kRtcpSdesChunkCode: + sdes_chunk_.Set(parser.Packet().CName); + break; + case RTCPUtility::kRtcpByeCode: + bye_.Set(parser.Packet().BYE); + break; + case RTCPUtility::kRtcpAppCode: + app_.Set(parser.Packet().APP); + break; + case RTCPUtility::kRtcpAppItemCode: + app_item_.Set(parser.Packet().APP); + break; + case RTCPUtility::kRtcpExtendedIjCode: + ij_.Set(); + break; + case RTCPUtility::kRtcpExtendedIjItemCode: + ij_item_.Set(parser.Packet().ExtendedJitterReportItem); + break; + case RTCPUtility::kRtcpPsfbPliCode: + pli_.Set(parser.Packet().PLI); + break; + case RTCPUtility::kRtcpPsfbSliCode: + sli_.Set(parser.Packet().SLI); + break; + case RTCPUtility::kRtcpPsfbSliItemCode: + sli_item_.Set(parser.Packet().SLIItem); + break; case RTCPUtility::kRtcpPsfbRpsiCode: rpsi_.Set(parser.Packet().RPSI); break; diff --git a/test/rtcp_packet_parser.h b/test/rtcp_packet_parser.h index 4db58c35..a09674f3 100644 --- a/test/rtcp_packet_parser.h +++ b/test/rtcp_packet_parser.h @@ -13,6 +13,7 @@ #define WEBRTC_TEST_RTCP_PACKET_PARSER_H_ #include <map> +#include <string> #include <vector> #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" @@ -100,6 +101,65 @@ class ReportBlock : public PacketType { RTCPUtility::RTCPPacketReportBlockItem rb_; }; +class Ij : public PacketType { + public: + Ij() {} + virtual ~Ij() {} + + private: + friend class RtcpPacketParser; + + void Set() { ++num_packets_; } +}; + +class IjItem : public PacketType { + public: + IjItem() {} + virtual ~IjItem() {} + + uint32_t Jitter() const { return ij_item_.Jitter; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketExtendedJitterReportItem& ij_item) { + ij_item_ = ij_item; + ++num_packets_; + } + + RTCPUtility::RTCPPacketExtendedJitterReportItem ij_item_; +}; + +class Sdes : public PacketType { + public: + Sdes() {} + virtual ~Sdes() {} + + private: + friend class RtcpPacketParser; + + void Set() { ++num_packets_; } +}; + +class SdesChunk : public PacketType { + public: + SdesChunk() {} + virtual ~SdesChunk() {} + + uint32_t Ssrc() const { return cname_.SenderSSRC; } + std::string Cname() const { return cname_.CName; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketSDESCName& cname) { + cname_ = cname; + ++num_packets_; + } + + RTCPUtility::RTCPPacketSDESCName cname_; +}; + class Bye : public PacketType { public: Bye() {} @@ -140,6 +200,102 @@ class Rpsi : public PacketType { RTCPUtility::RTCPPacketPSFBRPSI rpsi_; }; +class App : public PacketType { + public: + App() {} + virtual ~App() {} + + uint8_t SubType() const { return app_.SubType; } + uint32_t Name() const { return app_.Name; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketAPP& app) { + app_ = app; + ++num_packets_; + } + + RTCPUtility::RTCPPacketAPP app_; +}; + +class AppItem : public PacketType { + public: + AppItem() {} + virtual ~AppItem() {} + + uint8_t* Data() { return app_item_.Data; } + uint16_t DataLength() const { return app_item_.Size; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketAPP& app) { + app_item_ = app; + ++num_packets_; + } + + RTCPUtility::RTCPPacketAPP app_item_; +}; + +class Pli : public PacketType { + public: + Pli() {} + virtual ~Pli() {} + + uint32_t Ssrc() const { return pli_.SenderSSRC; } + uint32_t MediaSsrc() const { return pli_.MediaSSRC; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketPSFBPLI& pli) { + pli_ = pli; + ++num_packets_; + } + + RTCPUtility::RTCPPacketPSFBPLI pli_; +}; + +class Sli : public PacketType { + public: + Sli() {} + virtual ~Sli() {} + + uint32_t Ssrc() const { return sli_.SenderSSRC; } + uint32_t MediaSsrc() const { return sli_.MediaSSRC; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketPSFBSLI& sli) { + sli_ = sli; + ++num_packets_; + } + + RTCPUtility::RTCPPacketPSFBSLI sli_; +}; + +class SliItem : public PacketType { + public: + SliItem() {} + virtual ~SliItem() {} + + uint16_t FirstMb() const { return sli_item_.FirstMB; } + uint16_t NumberOfMb() const { return sli_item_.NumberOfMB; } + uint8_t PictureId() const { return sli_item_.PictureId; } + + private: + friend class RtcpPacketParser; + + void Set(const RTCPUtility::RTCPPacketPSFBSLIItem& sli_item) { + sli_item_ = sli_item; + ++num_packets_; + } + + RTCPUtility::RTCPPacketPSFBSLIItem sli_item_; +}; + class Fir : public PacketType { public: Fir() {} @@ -232,7 +388,16 @@ class RtcpPacketParser { SenderReport* sender_report() { return &sender_report_; } ReceiverReport* receiver_report() { return &receiver_report_; } ReportBlock* report_block() { return &report_block_; } + Sdes* sdes() { return &sdes_; } + SdesChunk* sdes_chunk() { return &sdes_chunk_; } Bye* bye() { return &bye_; } + App* app() { return &app_; } + AppItem* app_item() { return &app_item_; } + Ij* ij() { return &ij_; } + IjItem* ij_item() { return &ij_item_; } + Pli* pli() { return &pli_; } + Sli* sli() { return &sli_; } + SliItem* sli_item() { return &sli_item_; } Rpsi* rpsi() { return &rpsi_; } Fir* fir() { return &fir_; } FirItem* fir_item() { return &fir_item_; } @@ -247,7 +412,16 @@ class RtcpPacketParser { SenderReport sender_report_; ReceiverReport receiver_report_; ReportBlock report_block_; + Sdes sdes_; + SdesChunk sdes_chunk_; Bye bye_; + App app_; + AppItem app_item_; + Ij ij_; + IjItem ij_item_; + Pli pli_; + Sli sli_; + SliItem sli_item_; Rpsi rpsi_; Fir fir_; FirItem fir_item_; diff --git a/test/test_support_unittests.isolate b/test/test_support_unittests.isolate index 0f5de650..08bd4a4a 100644 --- a/test/test_support_unittests.isolate +++ b/test/test_support_unittests.isolate @@ -8,28 +8,26 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../DEPS', - '../../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/test/w3c/getusermedia_conformance_test.html b/test/w3c/getusermedia_conformance_test.html index 8a95032e..6ddb6030 100644 --- a/test/w3c/getusermedia_conformance_test.html +++ b/test/w3c/getusermedia_conformance_test.html @@ -27,9 +27,9 @@ Notice that this requires the site you're browsing to use HTTPS. <p>This page contains a foundation of conformance tests that can be expanded to cover most things in the W3C specification of the Media Capture and Streams API.</p> - <p>VERSION: These tests are based on the W3C Editor's Draft of August 24th, - 2013 - (<a href="http://dev.w3.org/2011/webrtc/editor/archives/20130824/getusermedia.html">http://dev.w3.org/2011/webrtc/editor/archives/20130824/getusermedia.html</a>) + <p>VERSION: These tests are based on the W3C Editor's Draft of 07 May, + 2014 + (<a href="http://dev.w3.org/2011/webrtc/editor/archives/20140507/getusermedia.html">http://dev.w3.org/2011/webrtc/editor/archives/20140507/getusermedia.html</a>) <p>STATUS: In its current state, it only performs simple checks on the various attributes and methods of the objects exposed by the API. There's not much functionality tested so far. The spec doesn't define if an attribute shall be @@ -37,9 +37,7 @@ Notice that this requires the site you're browsing to use HTTPS. inherited (<code>assert_inherits</code>). Since testharness.js doesn't offer any generic function that covers both, the method for verification is currently chosen according to the current Chrome implementation.</p> - <p>PREFIXES: These tests currently utilizes the <code>adapter.js</code> - script, which handle the prefixes used by different browsers.</p> - <p>HOW TO RUN: The easiest way is to tell your browser to: + <p>HOW TO RUN: For Chrome, do this: <ul> <li>Provide a fake webcam (<code>--use-fake-ui-for-media-stream</code> in Chrome)</li> @@ -49,14 +47,20 @@ Notice that this requires the site you're browsing to use HTTPS. (<code>--allow-file-access-from-files</code> in Chrome)</li> </ul> Then just load this HTML file to execute the tests.</p> + <p>For Firefox, set the media.navigator.permission.disabled property to true + about:config. You must have a webcam and microphone available on the system. + </p> <div id="log"></div> - <video width="320" height="240" id="local-view" autoplay="autoplay" - muted="true"></video> + <video id="local-view" autoplay="autoplay" muted="true"></video> - <script src="https://w3c-test.org/resources/testharness.js"></script> - <!-- Load the polyfill to switch-hit between Chrome and Firefox --> - <script src="https://webrtc.googlecode.com/svn/stable/webrtc/test/manual/adapter.js"></script> + <!-- These files are in place when executing on W3C. --> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/vendor-prefix.js" + data-prefixed-objects= '[{"ancestors":["navigator"], "name":"getUserMedia"}, + {"ancestors":["window"], "name":"RTCPeerConnection"}]' + data-prefixed-prototypes='[{"ancestors":["HTMLMediaElement"],"name":"srcObject"}]'></script> <script src="getusermedia_conformance_test.js"></script> </body> diff --git a/test/w3c/getusermedia_conformance_test.js b/test/w3c/getusermedia_conformance_test.js index 6be29320..fe1dcc8c 100644 --- a/test/w3c/getusermedia_conformance_test.js +++ b/test/w3c/getusermedia_conformance_test.js @@ -15,7 +15,7 @@ function failedCallback(test) { }); } function invokeGetUserMedia(test, okCallback) { - getUserMedia({ video: true, audio: true }, okCallback, + navigator.getUserMedia({ video: true, audio: true }, okCallback, failedCallback(test)); } @@ -105,7 +105,7 @@ mediaStreamTest.step(function() { // TODO(kjellander): verify number of tracks. mediaStreamTest.done(); }); - invokeGetUserMedia(mediaStreamTest, okCallback);; + invokeGetUserMedia(mediaStreamTest, okCallback); }); // 4.3 MediaStreamTrack. @@ -158,14 +158,12 @@ function verifyTrack(type, track) { }, '[MediaStreamTrack (' + type + ')] onunmute EventHandler'); test(function () { - // Missing in Chrome. assert_own_property(track, '_readonly'); assert_readonly(track, '_readonly'); assert_true(typeof track._readonly === 'boolean'); }, '[MediaStreamTrack (' + type + ')] _readonly attribute'); test(function () { - // Missing in Chrome. assert_own_property(track, 'remote'); assert_readonly(track, 'remote'); assert_true(typeof track.remote === 'boolean'); @@ -179,7 +177,6 @@ function verifyTrack(type, track) { }, '[MediaStreamTrack (' + type + ')] readyState attribute'); test(function () { - // Missing in Chrome. assert_own_property(track, 'onstarted'); assert_true(track.onstarted === null); }, '[MediaStreamTrack (' + type + ')] onstarted EventHandler'); @@ -190,53 +187,41 @@ function verifyTrack(type, track) { }, '[MediaStreamTrack (' + type + ')] onended EventHandler'); test(function () { - // Missing in Chrome. - assert_inherits(track, 'getSourceInfos'); - assert_true(typeof track.getSourceInfos === 'function'); - }, '[MediaStreamTrack (' + type + ')]: getSourceInfos function'); + assert_inherits(track, 'getNativeSettings'); + assert_true(typeof track.capabilities === 'function'); + }, '[MediaStreamTrack (' + type + ')]: getNativeSettings function'); test(function () { - // Missing in Chrome. - assert_inherits(track, 'constraints'); - assert_true(typeof track.constraints === 'function'); - }, '[MediaStreamTrack (' + type + ')]: constraints function'); + assert_inherits(track, 'clone'); + assert_true(typeof track.clone === 'function'); + }, '[MediaStreamTrack (' + type + ')] clone function'); test(function () { - // Missing in Chrome. - assert_inherits(track, 'states'); - assert_true(typeof track.states === 'function'); - }, '[MediaStreamTrack (' + type + ')]: states function'); + assert_inherits(track, 'stop'); + assert_true(typeof track.stop === 'function'); + }, '[MediaStreamTrack (' + type + ')] stop function'); test(function () { - // Missing in Chrome. - assert_inherits(track, 'capabilities'); + assert_inherits(track, 'getCapabilities'); assert_true(typeof track.capabilities === 'function'); - }, '[MediaStreamTrack (' + type + ')]: capabilities function'); - - test(function () { - // Missing in Chrome. - assert_inherits(track, 'applyConstraints'); - assert_true(typeof track.applyConstraints === 'function'); - }, '[MediaStreamTrack (' + type + ')]: applyConstraints function'); + }, '[MediaStreamTrack (' + type + ')]: getCapabilities function'); test(function () { - // Missing in Chrome. - assert_own_property(track, 'onoverconstrained'); - assert_true(track.onoverconstrained === null); - }, '[MediaStreamTrack (' + type + ')] onoverconstrained EventHandler'); + assert_inherits(track, 'getConstraints'); + assert_true(typeof track.constraints === 'function'); + }, '[MediaStreamTrack (' + type + ')]: getConstraints function'); test(function () { - // Missing in Chrome. - assert_inherits(track, 'clone'); - assert_true(typeof track.clone === 'function'); - }, '[MediaStreamTrack (' + type + ')] clone function'); + assert_inherits(track, 'getSettings'); + assert_true(typeof track.constraints === 'function'); + }, '[MediaStreamTrack (' + type + ')]: getSettings function'); test(function () { - // Missing in Chrome. - assert_inherits(track, 'stop'); - assert_true(typeof track.stop === 'function'); - }, '[MediaStreamTrack (' + type + ')] stop function'); + assert_inherits(track, 'applyConstraints'); + assert_true(typeof track.applyConstraints === 'function'); + }, '[MediaStreamTrack (' + type + ')]: applyConstraints function'); }; + mediaStreamTrackTest.step(function() { var okCallback = mediaStreamTrackTest.step_func(function (stream) { verifyTrack('audio', stream.getAudioTracks()[0]); @@ -250,11 +235,11 @@ mediaStreamTrackTest.step(function() { var okCallback = mediaStreamTrackTest.step_func(function (stream) { // Verify event handlers are working. var track = stream.getVideoTracks()[0]; - track.onended = onendedCallback + track.onended = onEndedCallback track.stop(); mediaStreamTrackTest.done(); }); - var onendedCallback = mediaStreamTrackTest.step_func(function () { + var onEndedCallback = mediaStreamTrackTest.step_func(function () { assert_true(track.ended); mediaStreamTrackTest.done(); }); @@ -296,7 +281,7 @@ avTracksTest.step(function() { var createObjectURLTest = async_test('8.1 URL createObjectURL method'); createObjectURLTest.step(function() { var okCallback = createObjectURLTest.step_func(function (stream) { - var url = webkitURL.createObjectURL(stream); + var url = URL.createObjectURL(stream); assert_true(typeof url === 'string'); createObjectURLTest.done(); }); @@ -363,8 +348,7 @@ function verifyVideoTagWithStream(videoTag) { mediaElementsTest.step(function() { var okCallback = mediaElementsTest.step_func(function (stream) { var videoTag = document.getElementById('local-view'); - // Call the polyfill wrapper to attach the media stream to this element. - attachMediaStream(videoTag, stream); + videoTag.srcObject = stream; verifyVideoTagWithStream(videoTag); mediaElementsTest.done(); }); @@ -381,17 +365,12 @@ getUserMediaTest.step(function() { getUserMediaTest.done(); }); - // boolean parameters, without failure callback: - getUserMedia({ video: true, audio: true }, okCallback); - getUserMedia({ video: true, audio: false }, okCallback); - getUserMedia({ video: false, audio: true }, okCallback); - - // boolean parameters, with failure callback: - getUserMedia({ video: true, audio: true }, okCallback, + // All three arguments are mandatory, so pass all of them. + navigator.getUserMedia({ video: true, audio: true }, okCallback, failedCallback(getUserMediaTest)); - getUserMedia({ video: true, audio: false }, okCallback, + navigator.getUserMedia({ video: true, audio: false }, okCallback, failedCallback(getUserMediaTest)); - getUserMedia({ video: false, audio: true }, okCallback, + navigator.getUserMedia({ video: false, audio: true }, okCallback, failedCallback(getUserMediaTest)); }); @@ -413,7 +392,8 @@ constraintsTest.step(function() { constraints.video.mandatory.minHeight = 480; constraints.video.mandatory.minFrameRate = 15; - getUserMedia(constraints, okCallback, failedCallback(constraintsTest)); + navigator.getUserMedia(constraints, okCallback, + failedCallback(constraintsTest)); }); // 11.3 NavigatorUserMediaSuccessCallback. @@ -427,25 +407,3 @@ successCallbackTest.step(function() { invokeGetUserMedia(successCallbackTest, okCallback); }); -// 11.4 NavigatorUserMediaError and NavigatorUserMediaErrorCallback. -var errorCallbackTest = async_test('11.4 NavigatorUserMediaError and ' + - 'NavigatorUserMediaErrorCallback'); -errorCallbackTest.step(function() { - var okCallback = errorCallbackTest.step_func(function (stream) { - assert_unreached('Should not get a success callback'); - }); - var errorCallback = errorCallbackTest.step_func(function (error) { - assert_own_property(error, 'name'); - assert_readonly(error.name); - assert_true(typeof error.name === 'string'); - assert_equals(error.name, 'ConstraintNotSatisfiedError', 'error.name'); - errorCallbackTest.done(); - }); - // Setting both audio and video to false triggers an error callback. - // TODO(kjellander): Figure out if there's a way in the spec to trigger an - // error callback. - - // TODO(kjellander): Investigate why the error callback is not called when - // false/false is provided in Chrome. - getUserMedia({ video: false, audio: false }, okCallback, errorCallback); -}); diff --git a/test/w3c/peerconnection_conformance_test.html b/test/w3c/peerconnection_conformance_test.html index 30d06d74..05b7a9a0 100644 --- a/test/w3c/peerconnection_conformance_test.html +++ b/test/w3c/peerconnection_conformance_test.html @@ -1,35 +1,51 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!-- -To quickly iterate when developing this test, make sure you select -'Always allow this site to use this webcam' option in the dropdown menu of -Chrome when it's requesting access to your webcam. -Notice that this requires the site you're browsing to use HTTPS. - -Without that, the test might timeout before you have had the chance to accept -access to the webcam. +To quickly iterate when developing this test, use --use-fake-ui-for-media-stream +for Chrome and set the media.navigator.permission.disabled property to true in +Firefox. You must either have a webcam/mic available on the system or use for +instance --use-fake-device-for-media-stream for Chrome. --> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>PeerConnection Connection Test</title> - - <script src="https://w3c-test.org/resources/testharness.js"></script> - +</head> +<body> + <div id="log"></div> + <div> + <video id="local-view" autoplay="autoplay"></video> + <video id="remote-view" autoplay="autoplay"/> + </video> + </div> + + <!-- These files are in place when executing on W3C. --> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/vendor-prefix.js" + data-prefixed-objects= + '[{"ancestors":["navigator"], "name":"getUserMedia"}, + {"ancestors":["window"], "name":"RTCPeerConnection"}, + {"ancestors":["window"], "name":"RTCSessionDescription"}, + {"ancestors":["window"], "name":"RTCIceCandidate"}]' + data-prefixed-prototypes= + '[{"ancestors":["HTMLMediaElement"],"name":"srcObject"}]'> + </script> <script type="text/javascript"> var test = async_test('Can set up a basic WebRTC call.', {timeout: 5000}); + var gFirstConnection = null; var gSecondConnection = null; function getUserMediaOkCallback(localStream) { - gFirstConnection = new webkitRTCPeerConnection(null, null); + gFirstConnection = new RTCPeerConnection(null, null); gFirstConnection.onicecandidate = onIceCandidateToFirst; gFirstConnection.addStream(localStream); - gFirstConnection.createOffer(onOfferCreated); + gFirstConnection.createOffer(onOfferCreated, failed('createOffer')); var videoTag = document.getElementById('local-view'); - videoTag.src = webkitURL.createObjectURL(localStream); + videoTag.src = URL.createObjectURL(localStream); }; var onOfferCreated = test.step_func(function(offer) { @@ -41,7 +57,7 @@ access to the webcam. }); function receiveCall(offerSdp) { - gSecondConnection = new webkitRTCPeerConnection(null, null); + gSecondConnection = new RTCPeerConnection(null, null); gSecondConnection.onicecandidate = onIceCandidateToSecond; gSecondConnection.onaddstream = onRemoteStream; @@ -89,7 +105,7 @@ access to the webcam. var onRemoteStream = test.step_func(function(event) { var videoTag = document.getElementById('remote-view'); - videoTag.src = webkitURL.createObjectURL(event.stream); + videoTag.src = URL.createObjectURL(event.stream); }); // Returns a suitable error callback. @@ -101,19 +117,11 @@ access to the webcam. // This function starts the test. test.step(function() { - navigator.webkitGetUserMedia({ video: true, audio: true }, + navigator.getUserMedia({ video: true, audio: true }, getUserMediaOkCallback, failed('getUserMedia')); }); </script> -</head> - -<body> -<div> - <video width="320" height="240" id="remote-view" autoplay="autoplay"></video> - <video width="320" height="240" id="local-view" autoplay="autoplay"></video> -</div> -<div id="log"></div> </body> -</html>
\ No newline at end of file +</html> diff --git a/tools/OWNERS b/tools/OWNERS index 6be455c7..1532e3fd 100644 --- a/tools/OWNERS +++ b/tools/OWNERS @@ -1,5 +1,8 @@ phoglund@webrtc.org kjellander@webrtc.org + +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/tools/tools_unittests.isolate b/tools/tools_unittests.isolate index 54037805..18065749 100644 --- a/tools/tools_unittests.isolate +++ b/tools/tools_unittests.isolate @@ -8,29 +8,27 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../DEPS', - '../../resources/foreman_cif.yuv', - '../../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/resources/foreman_cif.yuv', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/video/bitrate_estimator_tests.cc b/video/bitrate_estimator_tests.cc index 7b74818e..f8b9060f 100644 --- a/video/bitrate_estimator_tests.cc +++ b/video/bitrate_estimator_tests.cc @@ -70,8 +70,10 @@ class BitrateEstimatorTest : public ::testing::Test { send_config_ = sender_call_->GetDefaultSendConfig(); send_config_.rtp.ssrcs.push_back(kSendSsrc); // Encoders will be set separately per stream. - send_config_.encoder_settings = - test::CreateEncoderSettings(NULL, "FAKE", kSendPayloadType, 1); + send_config_.encoder_settings.encoder = NULL; + send_config_.encoder_settings.payload_name = "FAKE"; + send_config_.encoder_settings.payload_type = kSendPayloadType; + video_streams_ = test::CreateVideoStreams(1); receive_config_ = receiver_call_->GetDefaultReceiveConfig(); assert(receive_config_.codecs.empty()); @@ -169,15 +171,15 @@ class BitrateEstimatorTest : public ::testing::Test { fake_decoder_() { test_->send_config_.rtp.ssrcs[0]++; test_->send_config_.encoder_settings.encoder = &fake_encoder_; - send_stream_ = - test_->sender_call_->CreateVideoSendStream(test_->send_config_); - assert(test_->send_config_.encoder_settings.streams.size() == 1); - frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( - send_stream_->Input(), - test_->send_config_.encoder_settings.streams[0].width, - test_->send_config_.encoder_settings.streams[0].height, - 30, - Clock::GetRealTimeClock())); + send_stream_ = test_->sender_call_->CreateVideoSendStream( + test_->send_config_, test_->video_streams_, NULL); + assert(test_->video_streams_.size() == 1); + frame_generator_capturer_.reset( + test::FrameGeneratorCapturer::Create(send_stream_->Input(), + test_->video_streams_[0].width, + test_->video_streams_[0].height, + 30, + Clock::GetRealTimeClock())); send_stream_->Start(); frame_generator_capturer_->Start(); @@ -227,6 +229,7 @@ class BitrateEstimatorTest : public ::testing::Test { scoped_ptr<Call> sender_call_; scoped_ptr<Call> receiver_call_; VideoSendStream::Config send_config_; + std::vector<VideoStream> video_streams_; VideoReceiveStream::Config receive_config_; std::vector<Stream*> streams_; }; diff --git a/video/call.cc b/video/call.cc index 6adb0fcc..6daa8b07 100644 --- a/video/call.cc +++ b/video/call.cc @@ -70,7 +70,9 @@ class Call : public webrtc::Call, public PacketReceiver { virtual VideoSendStream::Config GetDefaultSendConfig() OVERRIDE; virtual VideoSendStream* CreateVideoSendStream( - const VideoSendStream::Config& config) OVERRIDE; + const VideoSendStream::Config& config, + const std::vector<VideoStream>& video_streams, + const void* encoder_settings) OVERRIDE; virtual void DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) OVERRIDE; @@ -129,6 +131,8 @@ Call* Call::Create(const Call::Config& config) { namespace internal { +const int kDefaultVideoStreamBitrateBps = 300000; + Call::Call(webrtc::VideoEngine* video_engine, const Call::Config& config) : config_(config), receive_lock_(RWLockWrapper::CreateRWLock()), @@ -175,15 +179,23 @@ VideoSendStream::Config Call::GetDefaultSendConfig() { } VideoSendStream* Call::CreateVideoSendStream( - const VideoSendStream::Config& config) { + const VideoSendStream::Config& config, + const std::vector<VideoStream>& video_streams, + const void* encoder_settings) { assert(config.rtp.ssrcs.size() > 0); + // TODO(mflodman): Base the start bitrate on a current bandwidth estimate, if + // the call has already started. VideoSendStream* send_stream = new VideoSendStream( config_.send_transport, overuse_observer_proxy_.get(), video_engine_, config, - base_channel_id_); + video_streams, + encoder_settings, + base_channel_id_, + config_.start_bitrate_bps != -1 ? config_.start_bitrate_bps + : kDefaultVideoStreamBitrateBps); WriteLockScoped write_lock(*send_lock_); for (size_t i = 0; i < config.rtp.ssrcs.size(); ++i) { diff --git a/video/call_perf_tests.cc b/video/call_perf_tests.cc index bc0a1e01..fa3f2388 100644 --- a/video/call_perf_tests.cc +++ b/video/call_perf_tests.cc @@ -53,18 +53,19 @@ class CallPerfTest : public ::testing::Test { : send_stream_(NULL), fake_encoder_(Clock::GetRealTimeClock()) {} protected: - VideoSendStream::Config GetSendTestConfig(Call* call) { - VideoSendStream::Config config = call->GetDefaultSendConfig(); - config.rtp.ssrcs.push_back(kSendSsrc); - config.encoder_settings = test::CreateEncoderSettings( - &fake_encoder_, "FAKE", kSendPayloadType, 1); - return config; + void CreateTestConfig(Call* call) { + send_config_ = call->GetDefaultSendConfig(); + send_config_.rtp.ssrcs.push_back(kSendSsrc); + send_config_.encoder_settings.encoder = &fake_encoder_; + send_config_.encoder_settings.payload_type = kSendPayloadType; + send_config_.encoder_settings.payload_name = "FAKE"; + video_streams_ = test::CreateVideoStreams(1); } void RunVideoSendTest(Call* call, const VideoSendStream::Config& config, test::RtpRtcpObserver* observer) { - send_stream_ = call->CreateVideoSendStream(config); + send_stream_ = call->CreateVideoSendStream(config, video_streams_, NULL); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( test::FrameGeneratorCapturer::Create( send_stream_->Input(), 320, 240, 30, Clock::GetRealTimeClock())); @@ -86,6 +87,8 @@ class CallPerfTest : public ::testing::Test { int start_time_ms, int run_time_ms); + VideoSendStream::Config send_config_; + std::vector<VideoStream> video_streams_; VideoSendStream* send_stream_; test::FakeEncoder fake_encoder_; }; @@ -288,35 +291,34 @@ TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSync) { test::FakeDecoder fake_decoder; - VideoSendStream::Config send_config = GetSendTestConfig(sender_call.get()); + CreateTestConfig(sender_call.get()); VideoReceiveStream::Config receive_config = receiver_call->GetDefaultReceiveConfig(); assert(receive_config.codecs.empty()); VideoCodec codec = - test::CreateDecoderVideoCodec(send_config.encoder_settings); + test::CreateDecoderVideoCodec(send_config_.encoder_settings); receive_config.codecs.push_back(codec); assert(receive_config.external_decoders.empty()); ExternalVideoDecoder decoder; decoder.decoder = &fake_decoder; - decoder.payload_type = send_config.encoder_settings.payload_type; + decoder.payload_type = send_config_.encoder_settings.payload_type; receive_config.external_decoders.push_back(decoder); - receive_config.rtp.remote_ssrc = send_config.rtp.ssrcs[0]; + receive_config.rtp.remote_ssrc = send_config_.rtp.ssrcs[0]; receive_config.rtp.local_ssrc = kReceiverLocalSsrc; receive_config.renderer = &observer; receive_config.audio_channel_id = channel; VideoSendStream* send_stream = - sender_call->CreateVideoSendStream(send_config); + sender_call->CreateVideoSendStream(send_config_, video_streams_, NULL); VideoReceiveStream* receive_stream = receiver_call->CreateVideoReceiveStream(receive_config); scoped_ptr<test::FrameGeneratorCapturer> capturer( - test::FrameGeneratorCapturer::Create( - send_stream->Input(), - send_config.encoder_settings.streams[0].width, - send_config.encoder_settings.streams[0].height, - 30, - Clock::GetRealTimeClock())); + test::FrameGeneratorCapturer::Create(send_stream->Input(), + video_streams_[0].width, + video_streams_[0].height, + 30, + Clock::GetRealTimeClock())); receive_stream->Start(); send_stream->Start(); capturer->Start(); @@ -465,16 +467,15 @@ void CallPerfTest::TestCaptureNtpTime(const FakeNetworkPipe::Config& net_config, observer.SetReceivers(receiver_call->Receiver(), sender_call->Receiver()); // Configure send stream. - VideoSendStream::Config send_config = GetSendTestConfig(sender_call.get()); + CreateTestConfig(sender_call.get()); VideoSendStream* send_stream = - sender_call->CreateVideoSendStream(send_config); + sender_call->CreateVideoSendStream(send_config_, video_streams_, NULL); scoped_ptr<test::FrameGeneratorCapturer> capturer( - test::FrameGeneratorCapturer::Create( - send_stream->Input(), - send_config.encoder_settings.streams[0].width, - send_config.encoder_settings.streams[0].height, - 30, - Clock::GetRealTimeClock())); + test::FrameGeneratorCapturer::Create(send_stream->Input(), + video_streams_[0].width, + video_streams_[0].height, + 30, + Clock::GetRealTimeClock())); observer.SetCapturer(capturer.get()); // Configure receive stream. @@ -482,15 +483,15 @@ void CallPerfTest::TestCaptureNtpTime(const FakeNetworkPipe::Config& net_config, receiver_call->GetDefaultReceiveConfig(); assert(receive_config.codecs.empty()); VideoCodec codec = - test::CreateDecoderVideoCodec(send_config.encoder_settings); + test::CreateDecoderVideoCodec(send_config_.encoder_settings); receive_config.codecs.push_back(codec); assert(receive_config.external_decoders.empty()); ExternalVideoDecoder decoder; test::FakeDecoder fake_decoder; decoder.decoder = &fake_decoder; - decoder.payload_type = send_config.encoder_settings.payload_type; + decoder.payload_type = send_config_.encoder_settings.payload_type; receive_config.external_decoders.push_back(decoder); - receive_config.rtp.remote_ssrc = send_config.rtp.ssrcs[0]; + receive_config.rtp.remote_ssrc = send_config_.rtp.ssrcs[0]; receive_config.rtp.local_ssrc = kReceiverLocalSsrc; receive_config.renderer = &observer; // Enable the receiver side rtt calculation. @@ -559,8 +560,8 @@ TEST_F(CallPerfTest, RegisterCpuOveruseObserver) { call_config.overuse_callback = &observer; scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = GetSendTestConfig(call.get()); - RunVideoSendTest(call.get(), send_config, &observer); + CreateTestConfig(call.get()); + RunVideoSendTest(call.get(), send_config_, &observer); } void CallPerfTest::TestMinTransmitBitrate(bool pad_to_min_bitrate) { @@ -636,43 +637,41 @@ void CallPerfTest::TestMinTransmitBitrate(bool pad_to_min_bitrate) { scoped_ptr<Call> receiver_call( Call::Create(Call::Config(observer.ReceiveTransport()))); - VideoSendStream::Config send_config = GetSendTestConfig(sender_call.get()); + CreateTestConfig(sender_call.get()); fake_encoder_.SetMaxBitrate(kMaxEncodeBitrateKbps); observer.SetReceivers(receiver_call->Receiver(), sender_call->Receiver()); - send_config.pacing = true; if (pad_to_min_bitrate) { - send_config.rtp.min_transmit_bitrate_bps = kMinTransmitBitrateBps; + send_config_.rtp.min_transmit_bitrate_bps = kMinTransmitBitrateBps; } else { - assert(send_config.rtp.min_transmit_bitrate_bps == 0); + assert(send_config_.rtp.min_transmit_bitrate_bps == 0); } VideoReceiveStream::Config receive_config = receiver_call->GetDefaultReceiveConfig(); receive_config.codecs.clear(); VideoCodec codec = - test::CreateDecoderVideoCodec(send_config.encoder_settings); + test::CreateDecoderVideoCodec(send_config_.encoder_settings); receive_config.codecs.push_back(codec); test::FakeDecoder fake_decoder; ExternalVideoDecoder decoder; decoder.decoder = &fake_decoder; - decoder.payload_type = send_config.encoder_settings.payload_type; + decoder.payload_type = send_config_.encoder_settings.payload_type; receive_config.external_decoders.push_back(decoder); - receive_config.rtp.remote_ssrc = send_config.rtp.ssrcs[0]; + receive_config.rtp.remote_ssrc = send_config_.rtp.ssrcs[0]; receive_config.rtp.local_ssrc = kReceiverLocalSsrc; VideoSendStream* send_stream = - sender_call->CreateVideoSendStream(send_config); + sender_call->CreateVideoSendStream(send_config_, video_streams_, NULL); VideoReceiveStream* receive_stream = receiver_call->CreateVideoReceiveStream(receive_config); scoped_ptr<test::FrameGeneratorCapturer> capturer( - test::FrameGeneratorCapturer::Create( - send_stream->Input(), - send_config.encoder_settings.streams[0].width, - send_config.encoder_settings.streams[0].height, - 30, - Clock::GetRealTimeClock())); + test::FrameGeneratorCapturer::Create(send_stream->Input(), + video_streams_[0].width, + video_streams_[0].height, + 30, + Clock::GetRealTimeClock())); observer.SetSendStream(send_stream); receive_stream->Start(); send_stream->Start(); diff --git a/video/call_tests.cc b/video/call_tests.cc index 7b78af3d..5bcf1157 100644 --- a/video/call_tests.cc +++ b/video/call_tests.cc @@ -73,8 +73,10 @@ class CallTest : public ::testing::Test { receive_config_ = receiver_call_->GetDefaultReceiveConfig(); send_config_.rtp.ssrcs.push_back(kSendSsrc); - send_config_.encoder_settings = test::CreateEncoderSettings( - &fake_encoder_, "FAKE", kSendPayloadType, 1); + send_config_.encoder_settings.encoder = &fake_encoder_; + send_config_.encoder_settings.payload_name = "FAKE"; + send_config_.encoder_settings.payload_type = kSendPayloadType; + video_streams_ = test::CreateVideoStreams(1); assert(receive_config_.codecs.empty()); VideoCodec codec = @@ -92,17 +94,18 @@ class CallTest : public ::testing::Test { assert(send_stream_ == NULL); assert(receive_stream_ == NULL); - send_stream_ = sender_call_->CreateVideoSendStream(send_config_); + send_stream_ = + sender_call_->CreateVideoSendStream(send_config_, video_streams_, NULL); receive_stream_ = receiver_call_->CreateVideoReceiveStream(receive_config_); } void CreateFrameGenerator() { - frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( - send_stream_->Input(), - send_config_.encoder_settings.streams[0].width, - send_config_.encoder_settings.streams[0].height, - 30, - Clock::GetRealTimeClock())); + frame_generator_capturer_.reset( + test::FrameGeneratorCapturer::Create(send_stream_->Input(), + video_streams_[0].width, + video_streams_[0].height, + 30, + Clock::GetRealTimeClock())); } void StartSending() { @@ -139,6 +142,7 @@ class CallTest : public ::testing::Test { scoped_ptr<Call> receiver_call_; VideoSendStream::Config send_config_; + std::vector<VideoStream> video_streams_; VideoReceiveStream::Config receive_config_; VideoSendStream* send_stream_; @@ -350,8 +354,7 @@ TEST_F(CallTest, TransmitsFirstFrame) { StartSending(); scoped_ptr<test::FrameGenerator> frame_generator(test::FrameGenerator::Create( - send_config_.encoder_settings.streams[0].width, - send_config_.encoder_settings.streams[0].height)); + video_streams_[0].width, video_streams_[0].height)); send_stream_->Input()->SwapFrame(frame_generator->NextFrame()); EXPECT_EQ(kEventSignaled, renderer.Wait()) @@ -701,10 +704,9 @@ TEST_F(CallTest, UsesFrameCallbacks) { scoped_ptr<VP8Encoder> encoder(VP8Encoder::Create()); send_config_.encoder_settings.encoder = encoder.get(); send_config_.encoder_settings.payload_name = "VP8"; - ASSERT_EQ(1u, send_config_.encoder_settings.streams.size()) - << "Test setup error."; - send_config_.encoder_settings.streams[0].width = kWidth; - send_config_.encoder_settings.streams[0].height = kHeight; + ASSERT_EQ(1u, video_streams_.size()) << "Test setup error."; + video_streams_[0].width = kWidth; + video_streams_[0].height = kHeight; send_config_.pre_encode_callback = &pre_encode_callback; receive_config_.codecs.clear(); VideoCodec codec = @@ -1055,15 +1057,18 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) { VideoSendStream::Config send_config = sender_call->GetDefaultSendConfig(); send_config.rtp.ssrcs.push_back(ssrc); - send_config.encoder_settings = - test::CreateEncoderSettings(encoders[i].get(), "VP8", 124, 1); - VideoStream* stream = &send_config.encoder_settings.streams[0]; + send_config.encoder_settings.encoder = encoders[i].get(); + send_config.encoder_settings.payload_name = "VP8"; + send_config.encoder_settings.payload_type = 124; + std::vector<VideoStream> video_streams = test::CreateVideoStreams(1); + VideoStream* stream = &video_streams[0]; stream->width = width; stream->height = height; stream->max_framerate = 5; stream->min_bitrate_bps = stream->target_bitrate_bps = stream->max_bitrate_bps = 100000; - send_streams[i] = sender_call->CreateVideoSendStream(send_config); + send_streams[i] = + sender_call->CreateVideoSendStream(send_config, video_streams, NULL); send_streams[i]->Start(); VideoReceiveStream::Config receive_config = @@ -1154,8 +1159,7 @@ TEST_F(CallTest, ObserversEncodedFrames) { StartSending(); scoped_ptr<test::FrameGenerator> frame_generator(test::FrameGenerator::Create( - send_config_.encoder_settings.streams[0].width, - send_config_.encoder_settings.streams[0].height)); + video_streams_[0].width, video_streams_[0].height)); send_stream_->Input()->SwapFrame(frame_generator->NextFrame()); EXPECT_EQ(kEventSignaled, post_encode_observer.Wait()) diff --git a/video/full_stack.cc b/video/full_stack.cc index cb97cd85..6b21cbe1 100644 --- a/video/full_stack.cc +++ b/video/full_stack.cc @@ -398,16 +398,19 @@ TEST_P(FullStackTest, NoPacketLoss) { send_config.rtp.ssrcs.push_back(kSendSsrc); scoped_ptr<VP8Encoder> encoder(VP8Encoder::Create()); - send_config.encoder_settings = - test::CreateEncoderSettings(encoder.get(), "VP8", 124, 1); - VideoStream* stream = &send_config.encoder_settings.streams[0]; + send_config.encoder_settings.encoder = encoder.get(); + send_config.encoder_settings.payload_name = "VP8"; + send_config.encoder_settings.payload_type = 124; + std::vector<VideoStream> video_streams = test::CreateVideoStreams(1); + VideoStream* stream = &video_streams[0]; stream->width = params.clip.width; stream->height = params.clip.height; stream->min_bitrate_bps = stream->target_bitrate_bps = stream->max_bitrate_bps = params.bitrate * 1000; stream->max_framerate = params.clip.fps; - VideoSendStream* send_stream = call->CreateVideoSendStream(send_config); + VideoSendStream* send_stream = + call->CreateVideoSendStream(send_config, video_streams, NULL); analyzer.input_ = send_stream->Input(); scoped_ptr<test::FrameGeneratorCapturer> file_capturer( diff --git a/video/loopback.cc b/video/loopback.cc index eb2d5ae3..ea65ebb4 100644 --- a/video/loopback.cc +++ b/video/loopback.cc @@ -61,6 +61,8 @@ void Loopback() { test::DirectTransport transport; Call::Config call_config(&transport); + call_config.start_bitrate_bps = + static_cast<int>(flags::StartBitrate()) * 1000; scoped_ptr<Call> call(Call::Create(call_config)); // Loopback, call sends to itself. @@ -72,19 +74,21 @@ void Loopback() { send_config.local_renderer = local_preview.get(); scoped_ptr<VP8Encoder> encoder(VP8Encoder::Create()); - send_config.encoder_settings = - test::CreateEncoderSettings(encoder.get(), "VP8", 124, 1); - VideoStream* stream = &send_config.encoder_settings.streams[0]; + send_config.encoder_settings.encoder = encoder.get(); + send_config.encoder_settings.payload_name = "VP8"; + send_config.encoder_settings.payload_type = 124; + std::vector<VideoStream> video_streams = test::CreateVideoStreams(1); + VideoStream* stream = &video_streams[0]; stream->width = flags::Width(); stream->height = flags::Height(); stream->min_bitrate_bps = static_cast<int>(flags::MinBitrate()) * 1000; - stream->target_bitrate_bps = - static_cast<int>(flags::MaxBitrate()) * 1000; + stream->target_bitrate_bps = static_cast<int>(flags::MaxBitrate()) * 1000; stream->max_bitrate_bps = static_cast<int>(flags::MaxBitrate()) * 1000; stream->max_framerate = 30; stream->max_qp = 56; - VideoSendStream* send_stream = call->CreateVideoSendStream(send_config); + VideoSendStream* send_stream = + call->CreateVideoSendStream(send_config, video_streams, NULL); Clock* test_clock = Clock::GetRealTimeClock(); diff --git a/video/rampup_tests.cc b/video/rampup_tests.cc index c86963d0..94f1c19d 100644 --- a/video/rampup_tests.cc +++ b/video/rampup_tests.cc @@ -38,8 +38,9 @@ namespace webrtc { namespace { -static const int kAbsoluteSendTimeExtensionId = 7; +static const int kTransmissionTimeOffsetExtensionId = 6; static const int kMaxPacketSize = 1500; +static const unsigned int kSingleStreamTargetBps = 1000000; class StreamObserver : public newapi::Transport, public RemoteBitrateObserver { public: @@ -57,6 +58,7 @@ class StreamObserver : public newapi::Transport, public RemoteBitrateObserver { new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(false))), crit_(CriticalSectionWrapper::CreateCriticalSection()), expected_bitrate_bps_(0), + start_bitrate_bps_(0), rtx_media_ssrcs_(rtx_media_ssrcs), total_sent_(0), padding_sent_(0), @@ -75,8 +77,8 @@ class StreamObserver : public newapi::Transport, public RemoteBitrateObserver { rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(config)); rtp_rtcp_->SetREMBStatus(true); rtp_rtcp_->SetRTCPStatus(kRtcpNonCompound); - rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime, - kAbsoluteSendTimeExtensionId); + rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionTransmissionTimeOffset, + kTransmissionTimeOffsetExtensionId); AbsoluteSendTimeRemoteBitrateEstimatorFactory rbe_factory; const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 30000; remote_bitrate_estimator_.reset( @@ -89,10 +91,25 @@ class StreamObserver : public newapi::Transport, public RemoteBitrateObserver { expected_bitrate_bps_ = expected_bitrate_bps; } + void set_start_bitrate_bps(unsigned int start_bitrate_bps) { + CriticalSectionScoped lock(crit_.get()); + start_bitrate_bps_ = start_bitrate_bps; + } + virtual void OnReceiveBitrateChanged(const std::vector<unsigned int>& ssrcs, unsigned int bitrate) OVERRIDE { CriticalSectionScoped lock(crit_.get()); assert(expected_bitrate_bps_ > 0); + if (start_bitrate_bps_ != 0) { + // For tests with an explicitly set start bitrate, verify the first + // bitrate estimate is close to the start bitrate and lower than the + // test target bitrate. This is to verify a call respects the configured + // start bitrate, but due to the BWE implementation we can't guarantee the + // first estimate really is as high as the start bitrate. + EXPECT_GT(bitrate, 0.9 * start_bitrate_bps_); + EXPECT_LT(bitrate, expected_bitrate_bps_); + start_bitrate_bps_ = 0; + } if (bitrate >= expected_bitrate_bps_) { // Just trigger if there was any rtx padding packet. if (rtx_media_ssrcs_.empty() || rtx_media_sent_ > 0) { @@ -178,6 +195,7 @@ class StreamObserver : public newapi::Transport, public RemoteBitrateObserver { const scoped_ptr<CriticalSectionWrapper> crit_; unsigned int expected_bitrate_bps_ GUARDED_BY(crit_); + unsigned int start_bitrate_bps_ GUARDED_BY(crit_); SsrcMap rtx_media_ssrcs_ GUARDED_BY(crit_); size_t total_sent_ GUARDED_BY(crit_); size_t padding_sent_ GUARDED_BY(crit_); @@ -218,8 +236,8 @@ class LowRateStreamObserver : public test::DirectTransport, rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(config)); rtp_rtcp_->SetREMBStatus(true); rtp_rtcp_->SetRTCPStatus(kRtcpNonCompound); - rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime, - kAbsoluteSendTimeExtensionId); + rtp_parser_->RegisterRtpHeaderExtension(kRtpExtensionTransmissionTimeOffset, + kTransmissionTimeOffsetExtensionId); AbsoluteSendTimeRemoteBitrateEstimatorFactory rbe_factory; const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 10000; remote_bitrate_estimator_.reset( @@ -400,14 +418,16 @@ class LowRateStreamObserver : public test::DirectTransport, size_t total_overuse_bytes_ GUARDED_BY(crit_); bool suspended_in_stats_ GUARDED_BY(crit_); }; -} +} // namespace class RampUpTest : public ::testing::Test { public: virtual void SetUp() { reserved_ssrcs_.clear(); } protected: - void RunRampUpTest(bool pacing, bool rtx, size_t num_streams) { + void RunRampUpTest(bool rtx, + size_t num_streams, + unsigned int start_bitrate_bps) { std::vector<uint32_t> ssrcs(GenerateSsrcs(num_streams, 100)); std::vector<uint32_t> rtx_ssrcs(GenerateSsrcs(num_streams, 200)); StreamObserver::SsrcMap rtx_ssrc_map; @@ -421,59 +441,61 @@ class RampUpTest : public ::testing::Test { Clock::GetRealTimeClock()); Call::Config call_config(&stream_observer); - webrtc::Config webrtc_config; - call_config.webrtc_config = &webrtc_config; - webrtc_config.Set<PaddingStrategy>(new PaddingStrategy(rtx)); + if (start_bitrate_bps != 0) { + call_config.start_bitrate_bps = start_bitrate_bps; + stream_observer.set_start_bitrate_bps(start_bitrate_bps); + } scoped_ptr<Call> call(Call::Create(call_config)); VideoSendStream::Config send_config = call->GetDefaultSendConfig(); receiver_transport.SetReceiver(call->Receiver()); test::FakeEncoder encoder(Clock::GetRealTimeClock()); - send_config.encoder_settings = - test::CreateEncoderSettings(&encoder, "FAKE", 125, num_streams); + send_config.encoder_settings.encoder = &encoder; + send_config.encoder_settings.payload_type = 125; + send_config.encoder_settings.payload_name = "FAKE"; + std::vector<VideoStream> video_streams = + test::CreateVideoStreams(num_streams); if (num_streams == 1) { - send_config.encoder_settings.streams[0].target_bitrate_bps = 2000000; - send_config.encoder_settings.streams[0].max_bitrate_bps = 2000000; + video_streams[0].target_bitrate_bps = 2000000; + video_streams[0].max_bitrate_bps = 2000000; } - send_config.pacing = pacing; send_config.rtp.nack.rtp_history_ms = 1000; send_config.rtp.ssrcs = ssrcs; if (rtx) { send_config.rtp.rtx.payload_type = 96; send_config.rtp.rtx.ssrcs = rtx_ssrcs; + send_config.rtp.rtx.pad_with_redundant_payloads = true; } send_config.rtp.extensions.push_back( - RtpExtension(RtpExtension::kAbsSendTime, kAbsoluteSendTimeExtensionId)); + RtpExtension(RtpExtension::kTOffset, + kTransmissionTimeOffsetExtensionId)); if (num_streams == 1) { // For single stream rampup until 1mbps - stream_observer.set_expected_bitrate_bps(1000000); + stream_observer.set_expected_bitrate_bps(kSingleStreamTargetBps); } else { // For multi stream rampup until all streams are being sent. That means - // enough birate to sent all the target streams plus the min bitrate of + // enough birate to send all the target streams plus the min bitrate of // the last one. - int expected_bitrate_bps = - send_config.encoder_settings.streams.back().min_bitrate_bps; - for (size_t i = 0; i < send_config.encoder_settings.streams.size() - 1; - ++i) { - expected_bitrate_bps += - send_config.encoder_settings.streams[i].target_bitrate_bps; + int expected_bitrate_bps = video_streams.back().min_bitrate_bps; + for (size_t i = 0; i < video_streams.size() - 1; ++i) { + expected_bitrate_bps += video_streams[i].target_bitrate_bps; } stream_observer.set_expected_bitrate_bps(expected_bitrate_bps); } - VideoSendStream* send_stream = call->CreateVideoSendStream(send_config); + VideoSendStream* send_stream = + call->CreateVideoSendStream(send_config, video_streams, NULL); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( - test::FrameGeneratorCapturer::Create( - send_stream->Input(), - send_config.encoder_settings.streams.back().width, - send_config.encoder_settings.streams.back().height, - send_config.encoder_settings.streams.back().max_framerate, - Clock::GetRealTimeClock())); + test::FrameGeneratorCapturer::Create(send_stream->Input(), + video_streams.back().width, + video_streams.back().height, + video_streams.back().max_framerate, + Clock::GetRealTimeClock())); send_stream->Start(); frame_generator_capturer->Start(); @@ -504,23 +526,29 @@ class RampUpTest : public ::testing::Test { receiver_transport.SetReceiver(call->Receiver()); test::FakeEncoder encoder(Clock::GetRealTimeClock()); - send_config.encoder_settings = - test::CreateEncoderSettings(&encoder, "FAKE", 125, number_of_streams); + send_config.encoder_settings.encoder = &encoder; + send_config.encoder_settings.payload_type = 125; + send_config.encoder_settings.payload_name = "FAKE"; + std::vector<VideoStream> video_streams = + test::CreateVideoStreams(number_of_streams); + send_config.rtp.nack.rtp_history_ms = 1000; send_config.rtp.ssrcs.insert( send_config.rtp.ssrcs.begin(), ssrcs.begin(), ssrcs.end()); send_config.rtp.extensions.push_back( - RtpExtension(RtpExtension::kAbsSendTime, kAbsoluteSendTimeExtensionId)); + RtpExtension(RtpExtension::kTOffset, + kTransmissionTimeOffsetExtensionId)); send_config.suspend_below_min_bitrate = true; - VideoSendStream* send_stream = call->CreateVideoSendStream(send_config); + VideoSendStream* send_stream = + call->CreateVideoSendStream(send_config, video_streams, NULL); stream_observer.SetSendStream(send_stream); size_t width = 0; size_t height = 0; - for (size_t i = 0; i < send_config.encoder_settings.streams.size(); ++i) { - size_t stream_width = send_config.encoder_settings.streams[i].width; - size_t stream_height = send_config.encoder_settings.streams[i].height; + for (size_t i = 0; i < video_streams.size(); ++i) { + size_t stream_width = video_streams[i].width; + size_t stream_height = video_streams[i].height; if (stream_width > width) width = stream_width; if (stream_height > height) @@ -559,25 +587,20 @@ class RampUpTest : public ::testing::Test { std::map<uint32_t, bool> reserved_ssrcs_; }; -TEST_F(RampUpTest, SingleStreamWithoutPacing) { - RunRampUpTest(false, false, 1); -} - -TEST_F(RampUpTest, SingleStreamWithPacing) { - RunRampUpTest(true, false, 1); +TEST_F(RampUpTest, SingleStream) { + RunRampUpTest(false, 1, 0); } -TEST_F(RampUpTest, SimulcastWithoutPacing) { - RunRampUpTest(false, false, 3); +TEST_F(RampUpTest, Simulcast) { + RunRampUpTest(false, 3, 0); } -TEST_F(RampUpTest, SimulcastWithPacing) { - RunRampUpTest(true, false, 3); +TEST_F(RampUpTest, SimulcastWithRtx) { + RunRampUpTest(true, 3, 0); } -// TODO(pbos): Re-enable, webrtc:2992. -TEST_F(RampUpTest, DISABLED_SimulcastWithPacingAndRtx) { - RunRampUpTest(true, true, 3); +TEST_F(RampUpTest, SingleStreamWithHighStartBitrate) { + RunRampUpTest(false, 1, 0.9 * kSingleStreamTargetBps); } TEST_F(RampUpTest, UpDownUpOneStream) { RunRampUpDownUpTest(1, false); } diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 012ca68e..9c3298c5 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -150,13 +150,13 @@ VideoReceiveStream::VideoReceiveStream(webrtc::VideoEngine* video_engine, external_codec_ = ViEExternalCodec::GetInterface(video_engine); for (size_t i = 0; i < config_.external_decoders.size(); ++i) { - ExternalVideoDecoder* decoder = &config_.external_decoders[i]; + const ExternalVideoDecoder& decoder = config_.external_decoders[i]; if (external_codec_->RegisterExternalReceiveCodec( channel_, - decoder->payload_type, - decoder->decoder, - decoder->renderer, - decoder->expected_delay_ms) != 0) { + decoder.payload_type, + decoder.decoder, + decoder.renderer, + decoder.expected_delay_ms) != 0) { // TODO(pbos): Abort gracefully? Can this be a runtime error? abort(); } diff --git a/video/video_receive_stream.h b/video/video_receive_stream.h index 4ff086a5..2a3c6dfe 100644 --- a/video/video_receive_stream.h +++ b/video/video_receive_stream.h @@ -69,7 +69,7 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream, private: TransportAdapter transport_adapter_; EncodedFrameCallbackAdapter encoded_frame_proxy_; - VideoReceiveStream::Config config_; + const VideoReceiveStream::Config config_; Clock* const clock_; ViEBase* video_engine_base_; diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc index 886e3dc3..f9bbd572 100644 --- a/video/video_send_stream.cc +++ b/video/video_send_stream.cc @@ -15,6 +15,7 @@ #include <vector> #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_codec.h" @@ -32,18 +33,7 @@ VideoSendStream::Config::EncoderSettings::ToString() const { ss << "{payload_name: " << payload_name; ss << ", payload_type: " << payload_type; if (encoder != NULL) - ss << ", (encoder)"; - if (encoder_settings != NULL) - ss << ", (encoder_settings)"; - - ss << ", streams: {"; - for (size_t i = 0; i < streams.size(); ++i) { - ss << streams[i].ToString(); - if (i != streams.size() - 1) - ss << "}, {"; - } - ss << '}'; - + ss << ", encoder: " << (encoder != NULL ? "(encoder)" : "NULL"); ss << '}'; return ss.str(); } @@ -111,8 +101,6 @@ std::string VideoSendStream::Config::ToString() const { } if (target_delay_ms > 0) ss << ", target_delay_ms: " << target_delay_ms; - if (pacing) - ss << ", pacing: on"; if (suspend_below_min_bitrate) ss << ", suspend_below_min_bitrate: on"; ss << '}'; @@ -124,25 +112,26 @@ VideoSendStream::VideoSendStream(newapi::Transport* transport, CpuOveruseObserver* overuse_observer, webrtc::VideoEngine* video_engine, const VideoSendStream::Config& config, - int base_channel) + const std::vector<VideoStream> video_streams, + const void* encoder_settings, + int base_channel, + int start_bitrate_bps) : transport_adapter_(transport), encoded_frame_proxy_(config.post_encode_callback), - codec_lock_(CriticalSectionWrapper::CreateCriticalSection()), config_(config), + start_bitrate_bps_(start_bitrate_bps), external_codec_(NULL), channel_(-1), stats_proxy_(new SendStatisticsProxy(config, this)) { video_engine_base_ = ViEBase::GetInterface(video_engine); video_engine_base_->CreateChannel(channel_, base_channel); assert(channel_ != -1); + assert(start_bitrate_bps_ > 0); rtp_rtcp_ = ViERTP_RTCP::GetInterface(video_engine); assert(rtp_rtcp_ != NULL); assert(config_.rtp.ssrcs.size() > 0); - if (config_.suspend_below_min_bitrate) - config_.pacing = true; - rtp_rtcp_->SetTransmissionSmoothingStatus(channel_, config_.pacing); assert(config_.rtp.min_transmit_bitrate_bps >= 0); rtp_rtcp_->SetMinTransmitBitrate(channel_, @@ -216,10 +205,8 @@ VideoSendStream::VideoSendStream(newapi::Transport* transport, } codec_ = ViECodec::GetInterface(video_engine); - if (!ReconfigureVideoEncoder(config_.encoder_settings.streams, - config_.encoder_settings.encoder_settings)) { + if (!ReconfigureVideoEncoder(video_streams, encoder_settings)) abort(); - } if (overuse_observer) video_engine_base_->RegisterCpuOveruseObserver(channel_, overuse_observer); @@ -232,9 +219,8 @@ VideoSendStream::VideoSendStream(newapi::Transport* transport, &encoded_frame_proxy_); } - if (config_.suspend_below_min_bitrate) { + if (config_.suspend_below_min_bitrate) codec_->SuspendBelowMinBitrate(channel_); - } rtp_rtcp_->RegisterSendChannelRtcpStatisticsCallback(channel_, stats_proxy_.get()); @@ -304,15 +290,12 @@ void VideoSendStream::Stop() { bool VideoSendStream::ReconfigureVideoEncoder( const std::vector<VideoStream>& streams, - void* encoder_settings) { + const void* encoder_settings) { assert(!streams.empty()); assert(config_.rtp.ssrcs.size() >= streams.size()); // TODO(pbos): Wire encoder_settings. assert(encoder_settings == NULL); - // VideoStreams in config_.encoder_settings need to be locked. - CriticalSectionScoped crit(codec_lock_.get()); - VideoCodec video_codec; memset(&video_codec, 0, sizeof(video_codec)); video_codec.codecType = @@ -370,21 +353,25 @@ bool VideoSendStream::ReconfigureVideoEncoder( video_codec.qpMax = std::max(video_codec.qpMax, static_cast<unsigned int>(streams[i].max_qp)); } + video_codec.startBitrate = + static_cast<unsigned int>(start_bitrate_bps_) / 1000; if (video_codec.minBitrate < kViEMinCodecBitrate) video_codec.minBitrate = kViEMinCodecBitrate; if (video_codec.maxBitrate < kViEMinCodecBitrate) video_codec.maxBitrate = kViEMinCodecBitrate; - - video_codec.startBitrate = 300; + if (video_codec.startBitrate < video_codec.minBitrate) + video_codec.startBitrate = video_codec.minBitrate; + if (video_codec.startBitrate > video_codec.maxBitrate) + video_codec.startBitrate = video_codec.maxBitrate; if (video_codec.startBitrate < video_codec.minBitrate) video_codec.startBitrate = video_codec.minBitrate; if (video_codec.startBitrate > video_codec.maxBitrate) video_codec.startBitrate = video_codec.maxBitrate; - assert(config_.encoder_settings.streams[0].max_framerate > 0); - video_codec.maxFramerate = config_.encoder_settings.streams[0].max_framerate; + assert(streams[0].max_framerate > 0); + video_codec.maxFramerate = streams[0].max_framerate; if (codec_->SetSendCodec(channel_, video_codec) != 0) return false; @@ -396,11 +383,10 @@ bool VideoSendStream::ReconfigureVideoEncoder( static_cast<unsigned char>(i)); } - config_.encoder_settings.streams = streams; - config_.encoder_settings.encoder_settings = encoder_settings; - - if (config_.rtp.rtx.ssrcs.empty()) + if (config_.rtp.rtx.ssrcs.empty()) { + assert(!config_.rtp.rtx.pad_with_redundant_payloads); return true; + } // Set up RTX. assert(config_.rtp.rtx.ssrcs.size() == config_.rtp.ssrcs.size()); @@ -411,6 +397,10 @@ bool VideoSendStream::ReconfigureVideoEncoder( static_cast<unsigned char>(i)); } + if (config_.rtp.rtx.pad_with_redundant_payloads) { + rtp_rtcp_->SetPadWithRedundantPayloads(channel_, true); + } + assert(config_.rtp.rtx.payload_type >= 0); rtp_rtcp_->SetRtxSendPayloadType(channel_, config_.rtp.rtx.payload_type); diff --git a/video/video_send_stream.h b/video/video_send_stream.h index a7e22676..ed77665c 100644 --- a/video/video_send_stream.h +++ b/video/video_send_stream.h @@ -42,7 +42,10 @@ class VideoSendStream : public webrtc::VideoSendStream, CpuOveruseObserver* overuse_observer, webrtc::VideoEngine* video_engine, const VideoSendStream::Config& config, - int base_channel); + const std::vector<VideoStream> video_streams, + const void* encoder_settings, + int base_channel, + int start_bitrate); virtual ~VideoSendStream(); @@ -50,7 +53,7 @@ class VideoSendStream : public webrtc::VideoSendStream, virtual void Stop() OVERRIDE; virtual bool ReconfigureVideoEncoder(const std::vector<VideoStream>& streams, - void* encoder_settings) OVERRIDE; + const void* encoder_settings) OVERRIDE; virtual Stats GetStats() const OVERRIDE; @@ -70,8 +73,8 @@ class VideoSendStream : public webrtc::VideoSendStream, private: TransportAdapter transport_adapter_; EncodedFrameCallbackAdapter encoded_frame_proxy_; - scoped_ptr<CriticalSectionWrapper> codec_lock_; - VideoSendStream::Config config_; + const VideoSendStream::Config config_; + const int start_bitrate_bps_; ViEBase* video_engine_base_; ViECapture* capture_; diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index 66628665..dcbcfe1b 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -45,9 +45,9 @@ class VideoSendStreamTest : public ::testing::Test { protected: void RunSendTest(Call* call, - const VideoSendStream::Config& config, test::RtpRtcpObserver* observer) { - send_stream_ = call->CreateVideoSendStream(config); + send_stream_ = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( test::FrameGeneratorCapturer::Create( send_stream_->Input(), 320, 240, 30, Clock::GetRealTimeClock())); @@ -62,22 +62,20 @@ class VideoSendStreamTest : public ::testing::Test { call->DestroyVideoSendStream(send_stream_); } - VideoSendStream::Config GetSendTestConfig(Call* call, size_t num_streams) { + void CreateTestConfig(Call* call, size_t num_streams) { assert(num_streams <= kNumSendSsrcs); - VideoSendStream::Config config = call->GetDefaultSendConfig(); - config.encoder_settings = test::CreateEncoderSettings( - &fake_encoder_, "FAKE", kFakeSendPayloadType, num_streams); - config.encoder_settings.encoder = &fake_encoder_; - config.encoder_settings.payload_type = kFakeSendPayloadType; + send_config_ = call->GetDefaultSendConfig(); + send_config_.encoder_settings.encoder = &fake_encoder_; + send_config_.encoder_settings.payload_name = "FAKE"; + send_config_.encoder_settings.payload_type = kFakeSendPayloadType; + video_streams_ = test::CreateVideoStreams(num_streams); + send_config_.encoder_settings.payload_type = kFakeSendPayloadType; for (size_t i = 0; i < num_streams; ++i) - config.rtp.ssrcs.push_back(kSendSsrcs[i]); - config.pacing = true; - return config; + send_config_.rtp.ssrcs.push_back(kSendSsrcs[i]); } void TestNackRetransmission(uint32_t retransmit_ssrc, - uint8_t retransmit_payload_type, - bool enable_pacing); + uint8_t retransmit_payload_type); void TestPacketFragmentationSize(VideoFormat format, bool with_fec); @@ -91,6 +89,8 @@ class VideoSendStreamTest : public ::testing::Test { static const uint32_t kSendRtxSsrc; static const uint32_t kSendSsrcs[kNumSendSsrcs]; + VideoSendStream::Config send_config_; + std::vector<VideoStream> video_streams_; VideoSendStream* send_stream_; test::FakeEncoder fake_encoder_; }; @@ -158,24 +158,23 @@ void VideoSendStreamTest::SendsSetSsrcs(size_t num_ssrcs, Call::Config call_config(observer.SendTransport()); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = - GetSendTestConfig(call.get(), num_ssrcs); + CreateTestConfig(call.get(), num_ssrcs); if (num_ssrcs > 1) { // Set low simulcast bitrates to not have to wait for bandwidth ramp-up. - std::vector<VideoStream>* streams = &send_config.encoder_settings.streams; - for (size_t i = 0; i < streams->size(); ++i) { - (*streams)[i].min_bitrate_bps = 10000; - (*streams)[i].target_bitrate_bps = 10000; - (*streams)[i].max_bitrate_bps = 10000; + for (size_t i = 0; i < video_streams_.size(); ++i) { + video_streams_[i].min_bitrate_bps = 10000; + video_streams_[i].target_bitrate_bps = 10000; + video_streams_[i].max_bitrate_bps = 10000; } } - std::vector<VideoStream> all_streams = send_config.encoder_settings.streams; + std::vector<VideoStream> all_streams = video_streams_; if (send_single_ssrc_first) - send_config.encoder_settings.streams.resize(1); + video_streams_.resize(1); - send_stream_ = call->CreateVideoSendStream(send_config); + send_stream_ = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( test::FrameGeneratorCapturer::Create( send_stream_->Input(), 320, 240, 30, Clock::GetRealTimeClock())); @@ -204,8 +203,9 @@ TEST_F(VideoSendStreamTest, CanStartStartedStream) { Call::Config call_config(&transport); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config config = GetSendTestConfig(call.get(), 1); - VideoSendStream* stream = call->CreateVideoSendStream(config); + CreateTestConfig(call.get(), 1); + VideoSendStream* stream = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); stream->Start(); stream->Start(); call->DestroyVideoSendStream(stream); @@ -216,8 +216,9 @@ TEST_F(VideoSendStreamTest, CanStopStoppedStream) { Call::Config call_config(&transport); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config config = GetSendTestConfig(call.get(), 1); - VideoSendStream* stream = call->CreateVideoSendStream(config); + CreateTestConfig(call.get(), 1); + VideoSendStream* stream = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); stream->Stop(); stream->Stop(); call->DestroyVideoSendStream(stream); @@ -260,10 +261,10 @@ TEST_F(VideoSendStreamTest, SupportsCName) { Call::Config call_config(observer.SendTransport()); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.c_name = kCName; + CreateTestConfig(call.get(), 1); + send_config_.rtp.c_name = kCName; - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); } TEST_F(VideoSendStreamTest, SupportsAbsoluteSendTime) { @@ -292,11 +293,11 @@ TEST_F(VideoSendStreamTest, SupportsAbsoluteSendTime) { Call::Config call_config(observer.SendTransport()); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.extensions.push_back( + CreateTestConfig(call.get(), 1); + send_config_.rtp.extensions.push_back( RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); } TEST_F(VideoSendStreamTest, SupportsTransmissionTimeOffset) { @@ -339,12 +340,12 @@ TEST_F(VideoSendStreamTest, SupportsTransmissionTimeOffset) { Call::Config call_config(observer.SendTransport()); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.encoder_settings.encoder = &encoder; - send_config.rtp.extensions.push_back( + CreateTestConfig(call.get(), 1); + send_config_.encoder_settings.encoder = &encoder; + send_config_.rtp.extensions.push_back( RtpExtension(RtpExtension::kTOffset, kTOffsetExtensionId)); - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); } class FakeReceiveStatistics : public NullReceiveStatistics { @@ -413,8 +414,9 @@ TEST_F(VideoSendStreamTest, SwapsI420VideoFrames) { Call::Config call_config(&transport); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - VideoSendStream* video_send_stream = call->CreateVideoSendStream(send_config); + CreateTestConfig(call.get(), 1); + VideoSendStream* video_send_stream = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); video_send_stream->Start(); I420VideoFrame frame; @@ -492,17 +494,16 @@ TEST_F(VideoSendStreamTest, SupportsFec) { observer.SetReceivers(call->Receiver(), NULL); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.fec.red_payload_type = kRedPayloadType; - send_config.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType; + CreateTestConfig(call.get(), 1); + send_config_.rtp.fec.red_payload_type = kRedPayloadType; + send_config_.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType; - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); } void VideoSendStreamTest::TestNackRetransmission( uint32_t retransmit_ssrc, - uint8_t retransmit_payload_type, - bool enable_pacing) { + uint8_t retransmit_payload_type) { class NackObserver : public test::RtpRtcpObserver { public: explicit NackObserver(uint32_t retransmit_ssrc, @@ -568,29 +569,23 @@ void VideoSendStreamTest::TestNackRetransmission( scoped_ptr<Call> call(Call::Create(call_config)); observer.SetReceivers(call->Receiver(), NULL); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.nack.rtp_history_ms = 1000; - send_config.rtp.rtx.payload_type = retransmit_payload_type; - send_config.pacing = enable_pacing; + CreateTestConfig(call.get(), 1); + send_config_.rtp.nack.rtp_history_ms = 1000; + send_config_.rtp.rtx.payload_type = retransmit_payload_type; if (retransmit_ssrc != kSendSsrc) - send_config.rtp.rtx.ssrcs.push_back(retransmit_ssrc); + send_config_.rtp.rtx.ssrcs.push_back(retransmit_ssrc); - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); } TEST_F(VideoSendStreamTest, RetransmitsNack) { // Normal NACKs should use the send SSRC. - TestNackRetransmission(kSendSsrc, kFakeSendPayloadType, false); + TestNackRetransmission(kSendSsrc, kFakeSendPayloadType); } TEST_F(VideoSendStreamTest, RetransmitsNackOverRtx) { // NACKs over RTX should use a separate SSRC. - TestNackRetransmission(kSendRtxSsrc, kSendRtxPayloadType, false); -} - -TEST_F(VideoSendStreamTest, RetransmitsNackOverRtxWithPacing) { - // NACKs over RTX should use a separate SSRC. - TestNackRetransmission(kSendRtxSsrc, kSendRtxPayloadType, true); + TestNackRetransmission(kSendRtxSsrc, kSendRtxPayloadType); } void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format, @@ -762,27 +757,26 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format, observer.SetReceivers(call->Receiver(), NULL); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); + CreateTestConfig(call.get(), 1); if (with_fec) { - send_config.rtp.fec.red_payload_type = kRedPayloadType; - send_config.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType; + send_config_.rtp.fec.red_payload_type = kRedPayloadType; + send_config_.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType; } if (format == kVP8) - send_config.encoder_settings.payload_name = "VP8"; + send_config_.encoder_settings.payload_name = "VP8"; - send_config.pacing = false; - send_config.encoder_settings.encoder = &encoder; - send_config.rtp.max_packet_size = kMaxPacketSize; - send_config.post_encode_callback = &observer; + send_config_.encoder_settings.encoder = &encoder; + send_config_.rtp.max_packet_size = kMaxPacketSize; + send_config_.post_encode_callback = &observer; // Add an extension header, to make the RTP header larger than the base // length of 12 bytes. static const uint8_t kAbsSendTimeExtensionId = 13; - send_config.rtp.extensions.push_back( + send_config_.rtp.extensions.push_back( RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); } // TODO(sprang): Is there any way of speeding up these tests? @@ -948,18 +942,18 @@ TEST_F(VideoSendStreamTest, SuspendBelowMinBitrate) { scoped_ptr<Call> call(Call::Create(call_config)); observer.SetReceiver(call->Receiver()); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.nack.rtp_history_ms = 1000; - send_config.pre_encode_callback = &observer; - send_config.suspend_below_min_bitrate = true; - int min_bitrate_bps = send_config.encoder_settings.streams[0].min_bitrate_bps; + CreateTestConfig(call.get(), 1); + send_config_.rtp.nack.rtp_history_ms = 1000; + send_config_.pre_encode_callback = &observer; + send_config_.suspend_below_min_bitrate = true; + int min_bitrate_bps = video_streams_[0].min_bitrate_bps; observer.set_low_remb_bps(min_bitrate_bps - 10000); int threshold_window = std::max(min_bitrate_bps / 10, 10000); - ASSERT_GT(send_config.encoder_settings.streams[0].max_bitrate_bps, + ASSERT_GT(video_streams_[0].max_bitrate_bps, min_bitrate_bps + threshold_window + 5000); observer.set_high_remb_bps(min_bitrate_bps + threshold_window + 5000); - RunSendTest(call.get(), send_config, &observer); + RunSendTest(call.get(), &observer); observer.Stop(); } @@ -1022,9 +1016,10 @@ TEST_F(VideoSendStreamTest, NoPaddingWhenVideoIsMuted) { scoped_ptr<Call> call(Call::Create(call_config)); observer.SetReceivers(call->Receiver(), call->Receiver()); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 3); + CreateTestConfig(call.get(), 3); - send_stream_ = call->CreateVideoSendStream(send_config); + send_stream_ = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( test::FrameGeneratorCapturer::Create( send_stream_->Input(), 320, 240, 30, Clock::GetRealTimeClock())); @@ -1107,11 +1102,12 @@ TEST_F(VideoSendStreamTest, ProducesStats) { Call::Config call_config(observer.SendTransport()); scoped_ptr<Call> call(Call::Create(call_config)); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.c_name = kCName; - observer.SetConfig(send_config); + CreateTestConfig(call.get(), 1); + send_config_.rtp.c_name = kCName; + observer.SetConfig(send_config_); - send_stream_ = call->CreateVideoSendStream(send_config); + send_stream_ = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); observer.SetSendStream(send_stream_); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( test::FrameGeneratorCapturer::Create( @@ -1202,9 +1198,10 @@ TEST_F(VideoSendStreamTest, MinTransmitBitrateRespectsRemb) { scoped_ptr<Call> call(Call::Create(call_config)); observer.SetReceivers(&observer, call->Receiver()); - VideoSendStream::Config send_config = GetSendTestConfig(call.get(), 1); - send_config.rtp.min_transmit_bitrate_bps = kMinTransmitBitrateBps; - send_stream_ = call->CreateVideoSendStream(send_config); + CreateTestConfig(call.get(), 1); + send_config_.rtp.min_transmit_bitrate_bps = kMinTransmitBitrateBps; + send_stream_ = + call->CreateVideoSendStream(send_config_, video_streams_, NULL); observer.SetSendStream(send_stream_); scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer( diff --git a/video_engine/OWNERS b/video_engine/OWNERS index cb0452fa..14bb8f3e 100644 --- a/video_engine/OWNERS +++ b/video_engine/OWNERS @@ -3,6 +3,8 @@ stefan@webrtc.org wu@webrtc.org mallinath@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/video_engine/include/vie_base.h b/video_engine/include/vie_base.h index 56916ce3..0a528cb1 100644 --- a/video_engine/include/vie_base.h +++ b/video_engine/include/vie_base.h @@ -63,16 +63,18 @@ const float kNormalUseStdDevMs = 20.0f; struct CpuOveruseOptions { CpuOveruseOptions() - : enable_capture_jitter_method(true), - low_capture_jitter_threshold_ms(kNormalUseStdDevMs), - high_capture_jitter_threshold_ms(kOveruseStdDevMs), - enable_encode_usage_method(false), - low_encode_usage_threshold_percent(60), - high_encode_usage_threshold_percent(90), - frame_timeout_interval_ms(1500), - min_frame_samples(120), - min_process_count(3), - high_threshold_consecutive_count(2) {} + : enable_capture_jitter_method(true), + low_capture_jitter_threshold_ms(kNormalUseStdDevMs), + high_capture_jitter_threshold_ms(kOveruseStdDevMs), + enable_encode_usage_method(false), + low_encode_usage_threshold_percent(60), + high_encode_usage_threshold_percent(90), + low_encode_time_rsd_threshold(-1), + high_encode_time_rsd_threshold(-1), + frame_timeout_interval_ms(1500), + min_frame_samples(120), + min_process_count(3), + high_threshold_consecutive_count(2) {} // Method based on inter-arrival jitter of captured frames. bool enable_capture_jitter_method; @@ -82,6 +84,12 @@ struct CpuOveruseOptions { bool enable_encode_usage_method; int low_encode_usage_threshold_percent; // Threshold for triggering underuse. int high_encode_usage_threshold_percent; // Threshold for triggering overuse. + int low_encode_time_rsd_threshold; // Additional threshold for triggering + // underuse (used in addition to + // threshold above if configured). + int high_encode_time_rsd_threshold; // Additional threshold for triggering + // overuse (used in addition to + // threshold above if configured). // General settings. int frame_timeout_interval_ms; // The maximum allowed interval between two // frames before resetting estimations. @@ -102,6 +110,8 @@ struct CpuOveruseOptions { o.low_encode_usage_threshold_percent && high_encode_usage_threshold_percent == o.high_encode_usage_threshold_percent && + low_encode_time_rsd_threshold == o.low_encode_time_rsd_threshold && + high_encode_time_rsd_threshold == o.high_encode_time_rsd_threshold && frame_timeout_interval_ms == o.frame_timeout_interval_ms && min_frame_samples == o.min_frame_samples && min_process_count == o.min_process_count && @@ -111,16 +121,18 @@ struct CpuOveruseOptions { struct CpuOveruseMetrics { CpuOveruseMetrics() - : capture_jitter_ms(-1), - avg_encode_time_ms(-1), - encode_usage_percent(-1), - capture_queue_delay_ms_per_s(-1) {} + : capture_jitter_ms(-1), + avg_encode_time_ms(-1), + encode_usage_percent(-1), + encode_rsd(-1), + capture_queue_delay_ms_per_s(-1) {} int capture_jitter_ms; // The current estimated jitter in ms based on // incoming captured frames. int avg_encode_time_ms; // The average encode time in ms. int encode_usage_percent; // The average encode time divided by the average // time difference between incoming captured frames. + int encode_rsd; // The relative std dev of encode time of frames. int capture_queue_delay_ms_per_s; // The current time delay between an // incoming captured frame until the frame // is being processed. The delay is @@ -150,7 +162,7 @@ class WEBRTC_DLLEXPORT VideoEngine { #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) // Android specific. - static int SetAndroidObjects(JavaVM* java_vm); + static int SetAndroidObjects(JavaVM* java_vm, jobject context); #endif protected: diff --git a/video_engine/include/vie_rtp_rtcp.h b/video_engine/include/vie_rtp_rtcp.h index 46d80989..972ca584 100644 --- a/video_engine/include/vie_rtp_rtcp.h +++ b/video_engine/include/vie_rtp_rtcp.h @@ -134,6 +134,15 @@ class WEBRTC_DLLEXPORT ViERTP_RTCP { virtual int SetRtxSendPayloadType(const int video_channel, const uint8_t payload_type) = 0; + // This enables sending redundant payloads when padding up the bitrate instead + // of sending dummy padding packets. This feature is off by default and will + // only have an effect if RTX is also enabled. + // TODO(holmer): Remove default implementation once this has been implemented + // in libjingle. + virtual int SetPadWithRedundantPayloads(int video_channel, bool enable) { + return 0; + } + virtual int SetRtxReceivePayloadType(const int video_channel, const uint8_t payload_type) = 0; diff --git a/video_engine/overuse_frame_detector.cc b/video_engine/overuse_frame_detector.cc index c136130b..ac9519f3 100644 --- a/video_engine/overuse_frame_detector.cc +++ b/video_engine/overuse_frame_detector.cc @@ -15,6 +15,7 @@ #include <algorithm> #include <list> +#include <map> #include "webrtc/modules/video_coding/utility/include/exp_filter.h" #include "webrtc/system_wrappers/interface/clock.h" @@ -37,7 +38,7 @@ const float kWeightFactorMean = 0.98f; const int kQuickRampUpDelayMs = 10 * 1000; // Delay between rampup attempts. Initially uses standard, scales up to max. const int kStandardRampUpDelayMs = 30 * 1000; -const int kMaxRampUpDelayMs = 120 * 1000; +const int kMaxRampUpDelayMs = 240 * 1000; // Expontential back-off factor, to prevent annoying up-down behaviour. const double kRampUpBackoffFactor = 2.0; @@ -125,7 +126,7 @@ class OveruseFrameDetector::EncodeTimeAvg { filtered_encode_time_ms_->Apply(exp, encode_time_ms); } - int filtered_encode_time_ms() const { + int Value() const { return static_cast<int>(filtered_encode_time_ms_->Value() + 0.5); } @@ -174,7 +175,7 @@ class OveruseFrameDetector::EncodeUsage { filtered_encode_time_ms_->Apply(exp, encode_time_ms); } - int UsageInPercent() const { + int Value() const { if (count_ < static_cast<uint32_t>(options_.min_frame_samples)) { return static_cast<int>(InitialUsageInPercent() + 0.5f); } @@ -185,6 +186,7 @@ class OveruseFrameDetector::EncodeUsage { return static_cast<int>(encode_usage_percent + 0.5); } + private: float InitialUsageInPercent() const { // Start in between the underuse and overuse threshold. return (options_.low_encode_usage_threshold_percent + @@ -195,7 +197,6 @@ class OveruseFrameDetector::EncodeUsage { return InitialUsageInPercent() * kInitialSampleDiffMs / 100; } - private: const float kWeightFactorFrameDiff; const float kWeightFactorEncodeTime; const float kInitialSampleDiffMs; @@ -206,6 +207,111 @@ class OveruseFrameDetector::EncodeUsage { scoped_ptr<VCMExpFilter> filtered_frame_diff_ms_; }; +// Class for calculating the relative standard deviation of encode times. +class OveruseFrameDetector::EncodeTimeRsd { + public: + EncodeTimeRsd(Clock* clock) + : kWeightFactor(0.6f), + count_(0), + filtered_rsd_(new VCMExpFilter(kWeightFactor)), + hist_samples_(0), + hist_sum_(0.0f), + last_process_time_ms_(clock->TimeInMilliseconds()) { + Reset(); + } + ~EncodeTimeRsd() {} + + void SetOptions(const CpuOveruseOptions& options) { + options_ = options; + } + + void Reset() { + count_ = 0; + filtered_rsd_->Reset(kWeightFactor); + filtered_rsd_->Apply(1.0f, InitialValue()); + hist_.clear(); + hist_samples_ = 0; + hist_sum_ = 0.0f; + } + + void AddEncodeSample(float encode_time_ms) { + int bin = static_cast<int>(encode_time_ms + 0.5f); + if (bin <= 0) { + // The frame was probably not encoded, skip possible dropped frame. + return; + } + ++count_; + ++hist_[bin]; + ++hist_samples_; + hist_sum_ += bin; + } + + void Process(int64_t now) { + if (count_ < static_cast<uint32_t>(options_.min_frame_samples)) { + // Have not received min number of frames since last reset. + return; + } + const int kMinHistSamples = 20; + if (hist_samples_ < kMinHistSamples) { + return; + } + const int64_t kMinDiffSinceLastProcessMs = 1000; + int64_t diff_last_process_ms = now - last_process_time_ms_; + if (now - last_process_time_ms_ <= kMinDiffSinceLastProcessMs) { + return; + } + last_process_time_ms_ = now; + + // Calculate variance (using samples above the mean). + // Checks for a larger encode time of some frames while there is a small + // increase in the average time. + int mean = hist_sum_ / hist_samples_; + float variance = 0.0f; + int total_count = 0; + for (std::map<int,int>::iterator it = hist_.begin(); + it != hist_.end(); ++it) { + int time = it->first; + int count = it->second; + if (time > mean) { + total_count += count; + for (int i = 0; i < count; ++i) { + variance += ((time - mean) * (time - mean)); + } + } + } + variance /= std::max(total_count, 1); + float cov = sqrt(variance) / mean; + + hist_.clear(); + hist_samples_ = 0; + hist_sum_ = 0.0f; + + float exp = static_cast<float>(diff_last_process_ms) / kProcessIntervalMs; + exp = std::min(exp, kMaxExp); + filtered_rsd_->Apply(exp, 100.0f * cov); + } + + int Value() const { + return static_cast<int>(filtered_rsd_->Value() + 0.5); + } + + private: + float InitialValue() const { + // Start in between the underuse and overuse threshold. + return std::max(((options_.low_encode_time_rsd_threshold + + options_.high_encode_time_rsd_threshold) / 2.0f), 0.0f); + } + + const float kWeightFactor; + uint32_t count_; // Number of encode samples since last reset. + CpuOveruseOptions options_; + scoped_ptr<VCMExpFilter> filtered_rsd_; + int hist_samples_; + float hist_sum_; + std::map<int,int> hist_; // Histogram of encode time of frames. + int64_t last_process_time_ms_; +}; + // Class for calculating the capture queue delay change. class OveruseFrameDetector::CaptureQueueDelay { public: @@ -252,7 +358,7 @@ class OveruseFrameDetector::CaptureQueueDelay { return delay_ms_; } - int filtered_delay_ms_per_s() const { + int Value() const { return static_cast<int>(filtered_delay_ms_per_s_->Value() + 0.5); } @@ -278,6 +384,7 @@ OveruseFrameDetector::OveruseFrameDetector(Clock* clock) num_pixels_(0), last_encode_sample_ms_(0), encode_time_(new EncodeTimeAvg()), + encode_rsd_(new EncodeTimeRsd(clock)), encode_usage_(new EncodeUsage()), capture_queue_delay_(new CaptureQueueDelay()) { } @@ -299,6 +406,7 @@ void OveruseFrameDetector::SetOptions(const CpuOveruseOptions& options) { options_ = options; capture_deltas_.SetOptions(options); encode_usage_->SetOptions(options); + encode_rsd_->SetOptions(options); ResetAll(num_pixels_); } @@ -311,10 +419,10 @@ void OveruseFrameDetector::GetCpuOveruseMetrics( CpuOveruseMetrics* metrics) const { CriticalSectionScoped cs(crit_.get()); metrics->capture_jitter_ms = static_cast<int>(capture_deltas_.StdDev() + 0.5); - metrics->avg_encode_time_ms = encode_time_->filtered_encode_time_ms(); - metrics->encode_usage_percent = encode_usage_->UsageInPercent(); - metrics->capture_queue_delay_ms_per_s = - capture_queue_delay_->filtered_delay_ms_per_s(); + metrics->avg_encode_time_ms = encode_time_->Value(); + metrics->encode_rsd = encode_rsd_->Value(); + metrics->encode_usage_percent = encode_usage_->Value(); + metrics->capture_queue_delay_ms_per_s = capture_queue_delay_->Value(); } int32_t OveruseFrameDetector::TimeUntilNextProcess() { @@ -340,6 +448,7 @@ void OveruseFrameDetector::ResetAll(int num_pixels) { num_pixels_ = num_pixels; capture_deltas_.Reset(); encode_usage_->Reset(); + encode_rsd_->Reset(); capture_queue_delay_->ClearFrames(); last_capture_time_ = 0; num_process_times_ = 0; @@ -374,6 +483,7 @@ void OveruseFrameDetector::FrameEncoded(int encode_time_ms) { int64_t diff_ms = time - last_encode_sample_ms_; encode_time_->AddEncodeSample(encode_time_ms, diff_ms); encode_usage_->AddEncodeSample(encode_time_ms, diff_ms); + encode_rsd_->AddEncodeSample(encode_time_ms); } last_encode_sample_ms_ = time; } @@ -391,6 +501,7 @@ int32_t OveruseFrameDetector::Process() { next_process_time_ = now + kProcessIntervalMs; ++num_process_times_; + encode_rsd_->Process(now); capture_queue_delay_->CalculateDelayChange(diff_ms); if (num_process_times_ <= options_.min_process_count) { @@ -430,11 +541,11 @@ int32_t OveruseFrameDetector::Process() { int rampup_delay = in_quick_rampup_ ? kQuickRampUpDelayMs : current_rampup_delay_ms_; - LOG(LS_VERBOSE) << "Capture input stats: avg: " << capture_deltas_.Mean() - << " std_dev " << capture_deltas_.StdDev() - << " rampup delay " << rampup_delay - << " overuse >= " << options_.high_capture_jitter_threshold_ms - << " underuse < " << options_.low_capture_jitter_threshold_ms; + LOG(LS_INFO) << " Frame stats: capture avg: " << capture_deltas_.Mean() + << " capture stddev " << capture_deltas_.StdDev() + << " encode usage " << encode_usage_->Value() + << " encode rsd " << encode_rsd_->Value() + << " rampup delay " << rampup_delay; return 0; } @@ -444,8 +555,14 @@ bool OveruseFrameDetector::IsOverusing() { overusing = capture_deltas_.StdDev() >= options_.high_capture_jitter_threshold_ms; } else if (options_.enable_encode_usage_method) { - overusing = encode_usage_->UsageInPercent() >= - options_.high_encode_usage_threshold_percent; + bool encode_usage_overuse = + encode_usage_->Value() >= options_.high_encode_usage_threshold_percent; + bool encode_rsd_overuse = false; + if (options_.high_encode_time_rsd_threshold > 0) { + encode_rsd_overuse = + (encode_rsd_->Value() >= options_.high_encode_time_rsd_threshold); + } + overusing = encode_usage_overuse || encode_rsd_overuse; } if (overusing) { @@ -466,8 +583,14 @@ bool OveruseFrameDetector::IsUnderusing(int64_t time_now) { underusing = capture_deltas_.StdDev() < options_.low_capture_jitter_threshold_ms; } else if (options_.enable_encode_usage_method) { - underusing = encode_usage_->UsageInPercent() < - options_.low_encode_usage_threshold_percent; + bool encode_usage_underuse = + encode_usage_->Value() < options_.low_encode_usage_threshold_percent; + bool encode_rsd_underuse = true; + if (options_.low_encode_time_rsd_threshold > 0) { + encode_rsd_underuse = + (encode_rsd_->Value() < options_.low_encode_time_rsd_threshold); + } + underusing = encode_usage_underuse && encode_rsd_underuse; } return underusing; } diff --git a/video_engine/overuse_frame_detector.h b/video_engine/overuse_frame_detector.h index 38b927ba..ef6d6aba 100644 --- a/video_engine/overuse_frame_detector.h +++ b/video_engine/overuse_frame_detector.h @@ -95,6 +95,7 @@ class OveruseFrameDetector : public Module { private: class EncodeTimeAvg; + class EncodeTimeRsd; class EncodeUsage; class CaptureQueueDelay; @@ -133,6 +134,7 @@ class OveruseFrameDetector : public Module { int64_t last_encode_sample_ms_; scoped_ptr<EncodeTimeAvg> encode_time_; + scoped_ptr<EncodeTimeRsd> encode_rsd_; scoped_ptr<EncodeUsage> encode_usage_; scoped_ptr<CaptureQueueDelay> capture_queue_delay_; diff --git a/video_engine/overuse_frame_detector_unittest.cc b/video_engine/overuse_frame_detector_unittest.cc index 2d7116f8..4e5d4bda 100644 --- a/video_engine/overuse_frame_detector_unittest.cc +++ b/video_engine/overuse_frame_detector_unittest.cc @@ -71,6 +71,12 @@ class OveruseFrameDetectorTest : public ::testing::Test { options_.high_encode_usage_threshold_percent) / 2.0f) + 0.5; } + int InitialEncodeRsd() { + return std::max( + ((options_.low_encode_time_rsd_threshold + + options_.high_encode_time_rsd_threshold) / 2.0f) + 0.5f, 0.0f); + } + void InsertFramesWithInterval( size_t num_frames, int interval_ms, int width, int height) { while (num_frames-- > 0) { @@ -111,7 +117,19 @@ class OveruseFrameDetectorTest : public ::testing::Test { } } - void TriggerNormalUsageWithEncodeUsage() { + void TriggerOveruseWithEncodeRsd(int num_times) { + const int kEncodeTimeMs1 = 10; + const int kEncodeTimeMs2 = 25; + for (int i = 0; i < num_times; ++i) { + InsertAndEncodeFramesWithInterval( + 200, kFrameInterval33ms, kWidth, kHeight, kEncodeTimeMs1); + InsertAndEncodeFramesWithInterval( + 10, kFrameInterval33ms, kWidth, kHeight, kEncodeTimeMs2); + overuse_detector_->Process(); + } + } + + void TriggerNormalUsageWithEncodeTime() { const int kEncodeTimeMs = 5; InsertAndEncodeFramesWithInterval( 1000, kFrameInterval33ms, kWidth, kHeight, kEncodeTimeMs); @@ -136,25 +154,37 @@ class OveruseFrameDetectorTest : public ::testing::Test { return metrics.encode_usage_percent; } + int EncodeRsd() { + CpuOveruseMetrics metrics; + overuse_detector_->GetCpuOveruseMetrics(&metrics); + return metrics.encode_rsd; + } + CpuOveruseOptions options_; scoped_ptr<SimulatedClock> clock_; scoped_ptr<MockCpuOveruseObserver> observer_; scoped_ptr<OveruseFrameDetector> overuse_detector_; }; +// enable_capture_jitter_method = true; +// CaptureJitterMs() > high_capture_jitter_threshold_ms => overuse. +// CaptureJitterMs() < low_capture_jitter_threshold_ms => underuse. TEST_F(OveruseFrameDetectorTest, TriggerOveruse) { + // capture_jitter > high => overuse EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(1); TriggerOveruse(options_.high_threshold_consecutive_count); } TEST_F(OveruseFrameDetectorTest, OveruseAndRecover) { + // capture_jitter > high => overuse EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(1); TriggerOveruse(options_.high_threshold_consecutive_count); + // capture_jitter < low => underuse EXPECT_CALL(*(observer_.get()), NormalUsage()).Times(testing::AtLeast(1)); TriggerNormalUsage(); } -TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverNoObserver) { +TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverWithNoObserver) { overuse_detector_->SetObserver(NULL); EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(0); TriggerOveruse(options_.high_threshold_consecutive_count); @@ -162,8 +192,9 @@ TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverNoObserver) { TriggerNormalUsage(); } -TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverDisabled) { +TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverWithMethodDisabled) { options_.enable_capture_jitter_method = false; + options_.enable_encode_usage_method = false; overuse_detector_->SetOptions(options_); EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(0); TriggerOveruse(options_.high_threshold_consecutive_count); @@ -221,6 +252,7 @@ TEST_F(OveruseFrameDetectorTest, GetCpuOveruseMetrics) { EXPECT_GT(metrics.avg_encode_time_ms, 0); EXPECT_GT(metrics.encode_usage_percent, 0); EXPECT_GE(metrics.capture_queue_delay_ms_per_s, 0); + EXPECT_GE(metrics.encode_rsd, 0); } TEST_F(OveruseFrameDetectorTest, CaptureJitter) { @@ -332,7 +364,7 @@ TEST_F(OveruseFrameDetectorTest, EncodedUsage) { const int kEncodeTimeMs = 5; InsertAndEncodeFramesWithInterval( 1000, kFrameInterval33ms, kWidth, kHeight, kEncodeTimeMs); - EXPECT_EQ(15, EncodeUsagePercent()); + EXPECT_EQ(kEncodeTimeMs * 100 / kFrameInterval33ms, EncodeUsagePercent()); } TEST_F(OveruseFrameDetectorTest, EncodeUsageResetAfterChangingThreshold) { @@ -345,10 +377,14 @@ TEST_F(OveruseFrameDetectorTest, EncodeUsageResetAfterChangingThreshold) { EXPECT_EQ(InitialEncodeUsage(), EncodeUsagePercent()); } +// enable_encode_usage_method = true; +// EncodeUsagePercent() > high_encode_usage_threshold_percent => overuse. +// EncodeUsagePercent() < low_encode_usage_threshold_percent => underuse. TEST_F(OveruseFrameDetectorTest, TriggerOveruseWithEncodeUsage) { options_.enable_capture_jitter_method = false; options_.enable_encode_usage_method = true; overuse_detector_->SetOptions(options_); + // usage > high => overuse EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(1); TriggerOveruseWithEncodeUsage(options_.high_threshold_consecutive_count); } @@ -357,9 +393,94 @@ TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverWithEncodeUsage) { options_.enable_capture_jitter_method = false; options_.enable_encode_usage_method = true; overuse_detector_->SetOptions(options_); + // usage > high => overuse EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(1); TriggerOveruseWithEncodeUsage(options_.high_threshold_consecutive_count); + // usage < low => underuse + EXPECT_CALL(*(observer_.get()), NormalUsage()).Times(testing::AtLeast(1)); + TriggerNormalUsageWithEncodeTime(); +} + +TEST_F(OveruseFrameDetectorTest, + OveruseAndRecoverWithEncodeUsageMethodDisabled) { + options_.enable_capture_jitter_method = false; + options_.enable_encode_usage_method = false; + overuse_detector_->SetOptions(options_); + // usage > high => overuse + EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(0); + TriggerOveruseWithEncodeUsage(options_.high_threshold_consecutive_count); + // usage < low => underuse + EXPECT_CALL(*(observer_.get()), NormalUsage()).Times(0); + TriggerNormalUsageWithEncodeTime(); +} + +TEST_F(OveruseFrameDetectorTest, EncodeRsdResetAfterChangingThreshold) { + EXPECT_EQ(InitialEncodeRsd(), EncodeRsd()); + options_.high_encode_time_rsd_threshold = 100; + overuse_detector_->SetOptions(options_); + EXPECT_EQ(InitialEncodeRsd(), EncodeRsd()); + options_.low_encode_time_rsd_threshold = 20; + overuse_detector_->SetOptions(options_); + EXPECT_EQ(InitialEncodeRsd(), EncodeRsd()); +} + +// enable_encode_usage_method = true; +// low/high_encode_time_rsd_threshold >= 0 +// EncodeUsagePercent() > high_encode_usage_threshold_percent || +// EncodeRsd() > high_encode_time_rsd_threshold => overuse. +// EncodeUsagePercent() < low_encode_usage_threshold_percent && +// EncodeRsd() < low_encode_time_rsd_threshold => underuse. +TEST_F(OveruseFrameDetectorTest, TriggerOveruseWithEncodeRsd) { + options_.enable_capture_jitter_method = false; + options_.enable_encode_usage_method = true; + options_.high_encode_time_rsd_threshold = 80; + overuse_detector_->SetOptions(options_); + // rsd > high, usage < high => overuse + EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(1); + TriggerOveruseWithEncodeRsd(options_.high_threshold_consecutive_count); + EXPECT_LT(EncodeUsagePercent(), options_.high_encode_usage_threshold_percent); +} + +TEST_F(OveruseFrameDetectorTest, OveruseAndRecoverWithEncodeRsd) { + options_.enable_capture_jitter_method = false; + options_.enable_encode_usage_method = true; + options_.low_encode_time_rsd_threshold = 20; + options_.high_encode_time_rsd_threshold = 80; + overuse_detector_->SetOptions(options_); + // rsd > high, usage < high => overuse + EXPECT_CALL(*(observer_.get()), OveruseDetected()).Times(1); + TriggerOveruseWithEncodeRsd(options_.high_threshold_consecutive_count); + EXPECT_LT(EncodeUsagePercent(), options_.high_encode_usage_threshold_percent); + // rsd < low, usage < low => underuse EXPECT_CALL(*(observer_.get()), NormalUsage()).Times(testing::AtLeast(1)); - TriggerNormalUsageWithEncodeUsage(); + TriggerNormalUsageWithEncodeTime(); +} + +TEST_F(OveruseFrameDetectorTest, NoUnderuseWithEncodeRsd_UsageGtLowThreshold) { + options_.enable_capture_jitter_method = false; + options_.enable_encode_usage_method = true; + options_.low_encode_usage_threshold_percent = 1; + options_.low_encode_time_rsd_threshold = 20; + options_.high_encode_time_rsd_threshold = 90; + overuse_detector_->SetOptions(options_); + // rsd < low, usage > low => no underuse + EXPECT_CALL(*(observer_.get()), NormalUsage()).Times(0); + TriggerNormalUsageWithEncodeTime(); + EXPECT_LT(EncodeRsd(), options_.low_encode_time_rsd_threshold); + EXPECT_GT(EncodeUsagePercent(), options_.low_encode_usage_threshold_percent); +} + +TEST_F(OveruseFrameDetectorTest, NoUnderuseWithEncodeRsd_RsdGtLowThreshold) { + options_.enable_capture_jitter_method = false; + options_.enable_encode_usage_method = true; + options_.low_encode_usage_threshold_percent = 20; + options_.low_encode_time_rsd_threshold = 1; + options_.high_encode_time_rsd_threshold = 90; + overuse_detector_->SetOptions(options_); + // rsd > low, usage < low => no underuse + EXPECT_CALL(*(observer_.get()), NormalUsage()).Times(0); + TriggerNormalUsageWithEncodeTime(); + EXPECT_GT(EncodeRsd(), options_.low_encode_time_rsd_threshold); + EXPECT_LT(EncodeUsagePercent(), options_.low_encode_usage_threshold_percent); } } // namespace webrtc diff --git a/video_engine/test/auto_test/OWNERS b/video_engine/test/auto_test/OWNERS index 3ee6b4bf..bbffda7e 100644 --- a/video_engine/test/auto_test/OWNERS +++ b/video_engine/test/auto_test/OWNERS @@ -1,3 +1,4 @@ +per-file *.isolate=kjellander@webrtc.org # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/video_engine/test/auto_test/primitives/base_primitives.cc b/video_engine/test/auto_test/primitives/base_primitives.cc index 4b464503..32f4b210 100644 --- a/video_engine/test/auto_test/primitives/base_primitives.cc +++ b/video_engine/test/auto_test/primitives/base_primitives.cc @@ -43,10 +43,13 @@ void TestI420CallSetup(webrtc::ViECodec* codec_interface, webrtc::VideoEngine* video_engine, webrtc::ViEBase* base_interface, webrtc::ViENetwork* network_interface, + webrtc::ViERTP_RTCP* rtp_rtcp_interface, int video_channel, const char* device_name) { webrtc::VideoCodec video_codec; memset(&video_codec, 0, sizeof(webrtc::VideoCodec)); + EXPECT_EQ(0, rtp_rtcp_interface->SetTransmissionSmoothingStatus(video_channel, + false)); ConfigureCodecsToI420(video_channel, video_codec, codec_interface); diff --git a/video_engine/test/auto_test/primitives/base_primitives.h b/video_engine/test/auto_test/primitives/base_primitives.h index 13f7928f..95687174 100644 --- a/video_engine/test/auto_test/primitives/base_primitives.h +++ b/video_engine/test/auto_test/primitives/base_primitives.h @@ -16,6 +16,7 @@ class VideoEngine; class ViEBase; class ViECodec; class ViENetwork; +class ViERTP_RTCP; } // Tests a I420-to-I420 call. This test exercises the most basic WebRTC @@ -26,6 +27,7 @@ void TestI420CallSetup(webrtc::ViECodec* codec_interface, webrtc::VideoEngine* video_engine, webrtc::ViEBase* base_interface, webrtc::ViENetwork* network_interface, + webrtc::ViERTP_RTCP* rtp_rtcp_interface, int video_channel, const char* device_name); diff --git a/video_engine/test/auto_test/source/vie_autotest_android.cc b/video_engine/test/auto_test/source/vie_autotest_android.cc index cc283b04..ac0dd17e 100644 --- a/video_engine/test/auto_test/source/vie_autotest_android.cc +++ b/video_engine/test/auto_test/source/vie_autotest_android.cc @@ -21,7 +21,7 @@ int ViEAutoTestAndroid::RunAutotest(int testSelection, int subTestSelection, JavaVM* javaVM, void* env, void* context) { ViEAutoTest vieAutoTest(window1, window2); ViETest::Log("RunAutoTest(%d, %d)", testSelection, subTestSelection); - webrtc::VideoEngine::SetAndroidObjects(javaVM); + webrtc::VideoEngine::SetAndroidObjects(javaVM, static_cast<jobject>(context)); #ifndef WEBRTC_ANDROID_OPENSLES // voice engine calls into ADM directly webrtc::VoiceEngine::SetAndroidObjects(javaVM, env, context); diff --git a/video_engine/test/auto_test/source/vie_autotest_base.cc b/video_engine/test/auto_test/source/vie_autotest_base.cc index 84da2229..4d032ef5 100644 --- a/video_engine/test/auto_test/source/vie_autotest_base.cc +++ b/video_engine/test/auto_test/source/vie_autotest_base.cc @@ -67,8 +67,8 @@ void ViEAutoTest::ViEBaseStandardTest() { ViETest::Log("You should shortly see a local preview from camera %s" " in window 1 and the remote video in window 2.", device_name); ::TestI420CallSetup(interfaces.codec, interfaces.video_engine, - base_interface, interfaces.network, video_channel, - device_name); + base_interface, interfaces.network, interfaces.rtp_rtcp, + video_channel, device_name); // *************************************************************** // Testing finished. Tear down Video Engine diff --git a/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc index 05540bc6..671e727c 100644 --- a/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc +++ b/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc @@ -179,8 +179,6 @@ void ViEAutoTest::ViERtpRtcpStandardTest() myTransport.ClearStats(); EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true)); - EXPECT_EQ(0, ViE.rtp_rtcp->SetTransmissionSmoothingStatus( - tbChannel.videoChannel, true)); EXPECT_EQ(0, ViE.base->StartReceive(tbChannel.videoChannel)); EXPECT_EQ(0, ViE.base->StartSend(tbChannel.videoChannel)); @@ -220,6 +218,7 @@ void ViEAutoTest::ViERtpRtcpStandardTest() myTransport.ClearStats(); const uint8_t kRtxPayloadType = 96; + // Temporarily disable pacing. EXPECT_EQ(0, ViE.rtp_rtcp->SetTransmissionSmoothingStatus( tbChannel.videoChannel, false)); EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true)); @@ -523,6 +522,7 @@ void ViEAutoTest::ViERtpRtcpStandardTest() ViETest::Log("Testing Network Down...\n"); EXPECT_EQ(0, ViE.rtp_rtcp->SetNACKStatus(tbChannel.videoChannel, true)); + // Reenable pacing. EXPECT_EQ(0, ViE.rtp_rtcp->SetTransmissionSmoothingStatus( tbChannel.videoChannel, true)); diff --git a/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc b/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc index f6c10002..4f3a90a7 100644 --- a/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc +++ b/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc @@ -66,8 +66,8 @@ bool ViEFileBasedComparisonTests::TestCallSetup( const char* device_name = "Fake Capture Device"; ::TestI420CallSetup(interfaces.codec, interfaces.video_engine, - interfaces.base, interfaces.network, video_channel, - device_name); + interfaces.base, interfaces.network, interfaces.rtp_rtcp, + video_channel, device_name); EXPECT_EQ(0, render_interface->StopRender(video_channel)); EXPECT_EQ(0, render_interface->RemoveRenderer(video_channel)); diff --git a/video_engine/test/auto_test/vie_auto_test.isolate b/video_engine/test/auto_test/vie_auto_test.isolate index 7a98a85c..762a7ac5 100644 --- a/video_engine/test/auto_test/vie_auto_test.isolate +++ b/video_engine/test/auto_test/vie_auto_test.isolate @@ -8,30 +8,28 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../../../data/', - '../../../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_touched': [ - '../../../../DEPS', + '<(DEPTH)/DEPS', ], 'isolate_dependency_tracked': [ - '../../../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/video_engine/video_engine_core.target.darwin-arm.mk b/video_engine/video_engine_core.target.darwin-arm.mk index eb4a9785..7e7e15de 100644 --- a/video_engine/video_engine_core.target.darwin-arm.mk +++ b/video_engine/video_engine_core.target.darwin-arm.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -150,6 +151,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -227,6 +229,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -267,6 +270,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.darwin-arm64.mk b/video_engine/video_engine_core.target.darwin-arm64.mk index 3bf3d920..4f2208c5 100644 --- a/video_engine/video_engine_core.target.darwin-arm64.mk +++ b/video_engine/video_engine_core.target.darwin-arm64.mk @@ -101,6 +101,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -137,6 +138,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -203,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -240,6 +243,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.darwin-mips.mk b/video_engine/video_engine_core.target.darwin-mips.mk index 5a0d5691..3971e705 100644 --- a/video_engine/video_engine_core.target.darwin-mips.mk +++ b/video_engine/video_engine_core.target.darwin-mips.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -216,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.darwin-x86.mk b/video_engine/video_engine_core.target.darwin-x86.mk index dedd1314..726e770c 100644 --- a/video_engine/video_engine_core.target.darwin-x86.mk +++ b/video_engine/video_engine_core.target.darwin-x86.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -142,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -213,6 +215,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -250,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.darwin-x86_64.mk b/video_engine/video_engine_core.target.darwin-x86_64.mk index bfcaa3a1..fdc3919d 100644 --- a/video_engine/video_engine_core.target.darwin-x86_64.mk +++ b/video_engine/video_engine_core.target.darwin-x86_64.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -141,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -211,6 +213,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk index eb4a9785..7e7e15de 100644 --- a/video_engine/video_engine_core.target.linux-arm.mk +++ b/video_engine/video_engine_core.target.linux-arm.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -150,6 +151,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -227,6 +229,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -267,6 +270,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.linux-arm64.mk b/video_engine/video_engine_core.target.linux-arm64.mk index 3bf3d920..4f2208c5 100644 --- a/video_engine/video_engine_core.target.linux-arm64.mk +++ b/video_engine/video_engine_core.target.linux-arm64.mk @@ -101,6 +101,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -137,6 +138,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -203,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -240,6 +243,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.linux-mips.mk b/video_engine/video_engine_core.target.linux-mips.mk index 5a0d5691..3971e705 100644 --- a/video_engine/video_engine_core.target.linux-mips.mk +++ b/video_engine/video_engine_core.target.linux-mips.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -216,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -255,6 +258,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk index dedd1314..726e770c 100644 --- a/video_engine/video_engine_core.target.linux-x86.mk +++ b/video_engine/video_engine_core.target.linux-x86.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -142,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -213,6 +215,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -250,6 +253,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core.target.linux-x86_64.mk b/video_engine/video_engine_core.target.linux-x86_64.mk index bfcaa3a1..fdc3919d 100644 --- a/video_engine/video_engine_core.target.linux-x86_64.mk +++ b/video_engine/video_engine_core.target.linux-x86_64.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -141,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -211,6 +213,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -248,6 +251,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/video_engine/video_engine_core_unittests.isolate b/video_engine/video_engine_core_unittests.isolate index 941cbad4..ec65e739 100644 --- a/video_engine/video_engine_core_unittests.isolate +++ b/video_engine/video_engine_core_unittests.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/video_engine/vie_channel.cc b/video_engine/vie_channel.cc index b830d86a..62bb0959 100644 --- a/video_engine/vie_channel.cc +++ b/video_engine/vie_channel.cc @@ -89,6 +89,7 @@ ViEChannel::ViEChannel(int32_t channel_id, intra_frame_observer_(intra_frame_observer), rtt_stats_(rtt_stats), paced_sender_(paced_sender), + pad_with_redundant_payloads_(false), bandwidth_observer_(bandwidth_observer), send_timestamp_extension_id_(kInvalidRtpExtensionId), absolute_send_time_extension_id_(kInvalidRtpExtensionId), @@ -102,8 +103,7 @@ ViEChannel::ViEChannel(int32_t channel_id, sender_(sender), nack_history_size_sender_(kSendSidePacketHistorySize), max_nack_reordering_threshold_(kMaxPacketAgeToNack), - pre_render_callback_(NULL), - config_(config) { + pre_render_callback_(NULL) { RtpRtcp::Configuration configuration; configuration.id = ViEModuleId(engine_id, channel_id); configuration.audio = false; @@ -860,19 +860,46 @@ int32_t ViEChannel::GetRemoteCSRC(uint32_t CSRCs[kRtpCsrcSize]) { return 0; } +void ViEChannel::SetPadWithRedundantPayloads(bool enable) { + { + CriticalSectionScoped cs(callback_cs_.get()); + pad_with_redundant_payloads_ = enable; + } + int mode; + uint32_t ssrc; + int payload_type; + rtp_rtcp_->RTXSendStatus(&mode, &ssrc, &payload_type); + if (mode != kRtxOff) { + // Since RTX was already enabled we have to reset it with payload-based + // padding on. + SetRtxSendStatus(true); + } +} + int ViEChannel::SetRtxSendPayloadType(int payload_type) { - int rtx_settings = kRtxRetransmitted; - if (config_.Get<PaddingStrategy>().redundant_payloads) - rtx_settings |= kRtxRedundantPayloads; rtp_rtcp_->SetRtxSendPayloadType(payload_type); + for (std::list<RtpRtcp*>::iterator it = simulcast_rtp_rtcp_.begin(); + it != simulcast_rtp_rtcp_.end(); it++) { + (*it)->SetRtxSendPayloadType(payload_type); + } + SetRtxSendStatus(true); + return 0; +} + +void ViEChannel::SetRtxSendStatus(bool enable) { + int rtx_settings = kRtxOff; + if (enable) { + CriticalSectionScoped cs(callback_cs_.get()); + rtx_settings = kRtxRetransmitted; + if (pad_with_redundant_payloads_) + rtx_settings |= kRtxRedundantPayloads; + } rtp_rtcp_->SetRTXSendStatus(rtx_settings); CriticalSectionScoped cs(rtp_rtcp_cs_.get()); for (std::list<RtpRtcp*>::iterator it = simulcast_rtp_rtcp_.begin(); it != simulcast_rtp_rtcp_.end(); it++) { - (*it)->SetRtxSendPayloadType(payload_type); (*it)->SetRTXSendStatus(rtx_settings); } - return 0; } void ViEChannel::SetRtxReceivePayloadType(int payload_type) { diff --git a/video_engine/vie_channel.h b/video_engine/vie_channel.h index 4837d7d6..23b7e5e5 100644 --- a/video_engine/vie_channel.h +++ b/video_engine/vie_channel.h @@ -145,6 +145,8 @@ class ViEChannel int32_t GetRemoteCSRC(uint32_t CSRCs[kRtpCsrcSize]); int SetRtxSendPayloadType(int payload_type); + // Only has an effect once RTX is enabled. + void SetPadWithRedundantPayloads(bool enable); void SetRtxReceivePayloadType(int payload_type); // Sets the starting sequence number, must be called before StartSend. @@ -370,6 +372,7 @@ class ViEChannel const unsigned char payload_typeFEC); // Compute NACK list parameters for the buffering mode. int GetRequiredNackListSize(int target_delay_ms); + void SetRtxSendStatus(bool enable); int32_t channel_id_; int32_t engine_id_; @@ -403,6 +406,7 @@ class ViEChannel RtcpIntraFrameObserver* intra_frame_observer_; RtcpRttStats* rtt_stats_; PacedSender* paced_sender_; + bool pad_with_redundant_payloads_; scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_; int send_timestamp_extension_id_; @@ -426,7 +430,6 @@ class ViEChannel int nack_history_size_sender_; int max_nack_reordering_threshold_; I420FrameCallback* pre_render_callback_; - const Config& config_; }; } // namespace webrtc diff --git a/video_engine/vie_impl.cc b/video_engine/vie_impl.cc index 34de8202..3cdf5da2 100644 --- a/video_engine/vie_impl.cc +++ b/video_engine/vie_impl.cc @@ -140,10 +140,10 @@ int VideoEngine::SetTraceCallback(TraceCallback* callback) { } #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) -int VideoEngine::SetAndroidObjects(JavaVM* javaVM) { +int VideoEngine::SetAndroidObjects(JavaVM* javaVM, jobject context) { LOG_F(LS_INFO); - if (SetCaptureAndroidVM(javaVM) != 0) { + if (SetCaptureAndroidVM(javaVM, context) != 0) { LOG(LS_ERROR) << "Could not set capture Android VM"; return -1; } diff --git a/video_engine/vie_rtp_rtcp_impl.cc b/video_engine/vie_rtp_rtcp_impl.cc index 3ee5d521..53610b4a 100644 --- a/video_engine/vie_rtp_rtcp_impl.cc +++ b/video_engine/vie_rtp_rtcp_impl.cc @@ -207,6 +207,21 @@ int ViERTP_RTCPImpl::SetRtxSendPayloadType(const int video_channel, return 0; } +int ViERTP_RTCPImpl::SetPadWithRedundantPayloads(int video_channel, + bool enable) { + LOG_F(LS_INFO) << "channel: " << video_channel + << " pad with redundant payloads: " << (enable ? "enable" : + "disable"); + ViEChannelManagerScoped cs(*(shared_data_->channel_manager())); + ViEChannel* vie_channel = cs.Channel(video_channel); + if (!vie_channel) { + shared_data_->SetLastError(kViERtpRtcpInvalidChannelId); + return -1; + } + vie_channel->SetPadWithRedundantPayloads(enable); + return 0; +} + int ViERTP_RTCPImpl::SetRtxReceivePayloadType(const int video_channel, const uint8_t payload_type) { LOG_F(LS_INFO) << "channel: " << video_channel diff --git a/video_engine/vie_rtp_rtcp_impl.h b/video_engine/vie_rtp_rtcp_impl.h index 1702d63e..5eec0efe 100644 --- a/video_engine/vie_rtp_rtcp_impl.h +++ b/video_engine/vie_rtp_rtcp_impl.h @@ -41,6 +41,7 @@ class ViERTP_RTCPImpl unsigned int CSRCs[kRtpCsrcSize]) const; virtual int SetRtxSendPayloadType(const int video_channel, const uint8_t payload_type); + virtual int SetPadWithRedundantPayloads(int video_channel, bool enable); virtual int SetRtxReceivePayloadType(const int video_channel, const uint8_t payload_type); virtual int SetStartSequenceNumber(const int video_channel, diff --git a/video_engine_tests.isolate b/video_engine_tests.isolate index c8ec481e..40454bd6 100644 --- a/video_engine_tests.isolate +++ b/video_engine_tests.isolate @@ -8,29 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../data/', - '../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../DEPS', - '../resources/foreman_cif_short.yuv', - '../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/resources/foreman_cif_short.yuv', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/video_send_stream.h b/video_send_stream.h index e173e3be..a1bc1782 100644 --- a/video_send_stream.h +++ b/video_send_stream.h @@ -61,13 +61,11 @@ class VideoSendStream { local_renderer(NULL), render_delay_ms(0), target_delay_ms(0), - pacing(false), suspend_below_min_bitrate(false) {} std::string ToString() const; struct EncoderSettings { - EncoderSettings() - : payload_type(-1), encoder(NULL), encoder_settings(NULL) {} + EncoderSettings() : payload_type(-1), encoder(NULL) {} std::string ToString() const; std::string payload_name; @@ -76,13 +74,6 @@ class VideoSendStream { // Uninitialized VideoEncoder instance to be used for encoding. Will be // initialized from inside the VideoSendStream. webrtc::VideoEncoder* encoder; - // TODO(pbos): Wire up encoder-specific settings. - // Encoder-specific settings, will be passed to the encoder during - // initialization. - void* encoder_settings; - - // List of stream settings to encode (resolution, bitrates, framerate). - std::vector<VideoStream> streams; } encoder_settings; static const size_t kDefaultMaxPacketSize = 1500 - 40; // TCP over IPv4. @@ -114,13 +105,17 @@ class VideoSendStream { // Settings for RTP retransmission payload format, see RFC 4588 for // details. struct Rtx { - Rtx() : payload_type(-1) {} + Rtx() : payload_type(-1), pad_with_redundant_payloads(false) {} std::string ToString() const; // SSRCs to use for the RTX streams. std::vector<uint32_t> ssrcs; // Payload type to use for the RTX stream. int payload_type; + // Use redundant payloads to pad the bitrate. Instead of padding with + // randomized packets, we will preemptively retransmit media packets on + // the RTX stream. + bool pad_with_redundant_payloads; } rtx; // RTCP CNAME, see RFC 3550. @@ -148,15 +143,9 @@ class VideoSendStream { // used for streaming instead of a real-time call. int target_delay_ms; - // True if network a send-side packet buffer should be used to pace out - // packets onto the network. - bool pacing; - // True if the stream should be suspended when the available bitrate fall // below the minimum configured bitrate. If this variable is false, the // stream may send at a rate higher than the estimated available bitrate. - // Enabling suspend_below_min_bitrate will also enable pacing and padding, - // otherwise, the video will be unable to recover from suspension. bool suspend_below_min_bitrate; }; @@ -171,7 +160,7 @@ class VideoSendStream { // in the config. Encoder settings are passed on to the encoder instance along // with the VideoStream settings. virtual bool ReconfigureVideoEncoder(const std::vector<VideoStream>& streams, - void* encoder_settings) = 0; + const void* encoder_settings) = 0; virtual Stats GetStats() const = 0; diff --git a/voice_engine/OWNERS b/voice_engine/OWNERS index e533e855..7bb3cd52 100644 --- a/voice_engine/OWNERS +++ b/voice_engine/OWNERS @@ -3,6 +3,8 @@ henrika@webrtc.org niklas.enbom@webrtc.org xians@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/voice_engine/voe_auto_test.isolate b/voice_engine/voe_auto_test.isolate index 651d074e..3722b7d7 100644 --- a/voice_engine/voe_auto_test.isolate +++ b/voice_engine/voe_auto_test.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk index 00443bd0..fb22fe3a 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -268,6 +271,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk index 4a9758f2..e60ca855 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -131,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index 9280e4bf..c505e51f 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -138,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -256,6 +259,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk index bf24f0d5..2f39989e 100644 --- a/voice_engine/voice_engine.target.darwin-x86.mk +++ b/voice_engine/voice_engine.target.darwin-x86.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -136,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -214,6 +216,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -251,6 +254,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk index bf780ba6..861ea41e 100644 --- a/voice_engine/voice_engine.target.darwin-x86_64.mk +++ b/voice_engine/voice_engine.target.darwin-x86_64.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -135,6 +136,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -212,6 +214,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk index 00443bd0..fb22fe3a 100644 --- a/voice_engine/voice_engine.target.linux-arm.mk +++ b/voice_engine/voice_engine.target.linux-arm.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -144,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -228,6 +230,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -268,6 +271,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk index 4a9758f2..e60ca855 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -131,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -204,6 +206,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk index 9280e4bf..c505e51f 100644 --- a/voice_engine/voice_engine.target.linux-mips.mk +++ b/voice_engine/voice_engine.target.linux-mips.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -138,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -217,6 +219,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -256,6 +259,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk index bf24f0d5..2f39989e 100644 --- a/voice_engine/voice_engine.target.linux-x86.mk +++ b/voice_engine/voice_engine.target.linux-x86.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -136,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -214,6 +216,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -251,6 +254,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk index bf780ba6..861ea41e 100644 --- a/voice_engine/voice_engine.target.linux-x86_64.mk +++ b/voice_engine/voice_engine.target.linux-x86_64.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -135,6 +136,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -212,6 +214,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -249,6 +252,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/voice_engine/voice_engine_unittests.isolate b/voice_engine/voice_engine_unittests.isolate index c350bce8..02356804 100644 --- a/voice_engine/voice_engine_unittests.isolate +++ b/voice_engine/voice_engine_unittests.isolate @@ -8,27 +8,25 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../data/', - '../../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../../testing/test_env.py', + '<(DEPTH)/testing/test_env.py', '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/webrtc.target.darwin-arm.mk b/webrtc.target.darwin-arm.mk index c20927aa..fd6eac73 100644 --- a/webrtc.target.darwin-arm.mk +++ b/webrtc.target.darwin-arm.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -127,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -201,6 +203,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.darwin-arm64.mk b/webrtc.target.darwin-arm64.mk index 544ead9f..21bdd799 100644 --- a/webrtc.target.darwin-arm64.mk +++ b/webrtc.target.darwin-arm64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -177,6 +179,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -214,6 +217,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.darwin-mips.mk b/webrtc.target.darwin-mips.mk index ee85ed80..69a80ea8 100644 --- a/webrtc.target.darwin-mips.mk +++ b/webrtc.target.darwin-mips.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.darwin-x86.mk b/webrtc.target.darwin-x86.mk index 25e17352..44e6a452 100644 --- a/webrtc.target.darwin-x86.mk +++ b/webrtc.target.darwin-x86.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -187,6 +189,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -224,6 +227,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.darwin-x86_64.mk b/webrtc.target.darwin-x86_64.mk index 6720fbfa..c8c1b92c 100644 --- a/webrtc.target.darwin-x86_64.mk +++ b/webrtc.target.darwin-x86_64.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -185,6 +187,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.linux-arm.mk b/webrtc.target.linux-arm.mk index c20927aa..fd6eac73 100644 --- a/webrtc.target.linux-arm.mk +++ b/webrtc.target.linux-arm.mk @@ -88,6 +88,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -127,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -201,6 +203,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -241,6 +244,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.linux-arm64.mk b/webrtc.target.linux-arm64.mk index 544ead9f..21bdd799 100644 --- a/webrtc.target.linux-arm64.mk +++ b/webrtc.target.linux-arm64.mk @@ -78,6 +78,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -177,6 +179,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -214,6 +217,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.linux-mips.mk b/webrtc.target.linux-mips.mk index ee85ed80..69a80ea8 100644 --- a/webrtc.target.linux-mips.mk +++ b/webrtc.target.linux-mips.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -190,6 +192,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -229,6 +232,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.linux-x86.mk b/webrtc.target.linux-x86.mk index 25e17352..44e6a452 100644 --- a/webrtc.target.linux-x86.mk +++ b/webrtc.target.linux-x86.mk @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -187,6 +189,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -224,6 +227,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc.target.linux-x86_64.mk b/webrtc.target.linux-x86_64.mk index 6720fbfa..c8c1b92c 100644 --- a/webrtc.target.linux-x86_64.mk +++ b/webrtc.target.linux-x86_64.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -118,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -185,6 +187,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -222,6 +225,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.darwin-arm.mk b/webrtc_common.target.darwin-arm.mk index 2321a28d..10bfcfb2 100644 --- a/webrtc_common.target.darwin-arm.mk +++ b/webrtc_common.target.darwin-arm.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.darwin-arm64.mk b/webrtc_common.target.darwin-arm64.mk index 280a249d..0c208222 100644 --- a/webrtc_common.target.darwin-arm64.mk +++ b/webrtc_common.target.darwin-arm64.mk @@ -72,6 +72,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -108,6 +109,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -171,6 +173,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -208,6 +211,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.darwin-mips.mk b/webrtc_common.target.darwin-mips.mk index 006649f6..40b55db8 100644 --- a/webrtc_common.target.darwin-mips.mk +++ b/webrtc_common.target.darwin-mips.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -223,6 +226,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.darwin-x86.mk b/webrtc_common.target.darwin-x86.mk index 4a28e9d6..d5376183 100644 --- a/webrtc_common.target.darwin-x86.mk +++ b/webrtc_common.target.darwin-x86.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.darwin-x86_64.mk b/webrtc_common.target.darwin-x86_64.mk index c65a9c55..36f9b878 100644 --- a/webrtc_common.target.darwin-x86_64.mk +++ b/webrtc_common.target.darwin-x86_64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -179,6 +181,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -216,6 +219,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.linux-arm.mk b/webrtc_common.target.linux-arm.mk index 2321a28d..10bfcfb2 100644 --- a/webrtc_common.target.linux-arm.mk +++ b/webrtc_common.target.linux-arm.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -121,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -195,6 +197,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -235,6 +238,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.linux-arm64.mk b/webrtc_common.target.linux-arm64.mk index 280a249d..0c208222 100644 --- a/webrtc_common.target.linux-arm64.mk +++ b/webrtc_common.target.linux-arm64.mk @@ -72,6 +72,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -108,6 +109,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -171,6 +173,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -208,6 +211,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.linux-mips.mk b/webrtc_common.target.linux-mips.mk index 006649f6..40b55db8 100644 --- a/webrtc_common.target.linux-mips.mk +++ b/webrtc_common.target.linux-mips.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -115,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -184,6 +186,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -223,6 +226,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.linux-x86.mk b/webrtc_common.target.linux-x86.mk index 4a28e9d6..d5376183 100644 --- a/webrtc_common.target.linux-x86.mk +++ b/webrtc_common.target.linux-x86.mk @@ -77,6 +77,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -181,6 +183,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -218,6 +221,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_common.target.linux-x86_64.mk b/webrtc_common.target.linux-x86_64.mk index c65a9c55..36f9b878 100644 --- a/webrtc_common.target.linux-x86_64.mk +++ b/webrtc_common.target.linux-x86_64.mk @@ -76,6 +76,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -112,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -179,6 +181,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -216,6 +219,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ diff --git a/webrtc_perf_tests.isolate b/webrtc_perf_tests.isolate index 08f5cbaf..b39c83df 100644 --- a/webrtc_perf_tests.isolate +++ b/webrtc_perf_tests.isolate @@ -8,31 +8,27 @@ { 'conditions': [ ['OS=="android"', { - # When doing Android builds, the WebRTC code is put in third_party/webrtc - # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../data/', - '../../resources/', + '<(DEPTH)/data/', + '<(DEPTH)/resources/', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../DEPS', - '../resources/foreman_cif.yuv', - '../resources/paris_qcif.yuv', - '../resources/voice_engine/audio_long16.pcm', - '../testing/test_env.py', + '<(DEPTH)/DEPS', + '<(DEPTH)/resources/foreman_cif.yuv', + '<(DEPTH)/resources/paris_qcif.yuv', + '<(DEPTH)/resources/voice_engine/audio_long16.pcm', '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../tools/swarming_client/', + '<(DEPTH)/tools/swarming_client/', ], }, }], diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index a76126c8..3c1dca69 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -75,7 +75,7 @@ 'target_name': 'webrtc_perf_tests', 'type': '<(gtest_target_type)', 'sources': [ - 'modules/audio_coding/neteq4/test/neteq_performance_unittest.cc', + 'modules/audio_coding/neteq/test/neteq_performance_unittest.cc', 'video/call_perf_tests.cc', 'video/full_stack.cc', 'video/rampup_tests.cc', |