a4df27b671
Reason for revert: Compile error on Android needs to be fixed before relanding. Original issue's description: > Reland "Added option to specify a maximum file size when recording an AEC dump.", commit ae2c5ad12afc8cc29fe9c59dea432b697b871a87. > > The revert of the original CL was commit 36d4c545007129446e551c45c17b25377dce89a4. > Original review: https://codereview.webrtc.org/1413483003/ > > The original CL changes a function on audio_processing.h that is used by Chrome, this CL adds back the old function. > > NOTRY=true > TBR=glaznev@webrtc.org, henrik.lundin@webrtc.org, solenberg@google.com, henrikg@webrtc.org, perkj@webrtc.org > BUG=webrtc:4741 > > Committed: https://crrev.com/f4f5cb09277d5ef6aeac8341e5f54a055867803a > Cr-Commit-Position: refs/heads/master@{#11093} TBR=glaznev@webrtc.org,henrik.lundin@webrtc.org,solenberg@google.com,henrikg@webrtc.org,perkj@webrtc.org,kwiberg@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4741 Review URL: https://codereview.webrtc.org/1537213002 Cr-Commit-Position: refs/heads/master@{#11094}
107 lines
4.8 KiB
C++
107 lines
4.8 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
|
|
#define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "talk/app/webrtc/peerconnectioninterface.h"
|
|
#include "talk/app/webrtc/proxy.h"
|
|
#include "webrtc/base/bind.h"
|
|
|
|
namespace webrtc {
|
|
|
|
BEGIN_PROXY_MAP(PeerConnectionFactory)
|
|
PROXY_METHOD1(void, SetOptions, const Options&)
|
|
// Can't use PROXY_METHOD5 because scoped_ptr must be moved.
|
|
// TODO(tommi,hbos): Use of templates to support scoped_ptr?
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
const MediaConstraintsInterface* a2,
|
|
PortAllocatorFactoryInterface* a3,
|
|
rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
|
|
PeerConnectionObserver* a5) override {
|
|
return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
|
rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot1, this,
|
|
a1, a2, a3, a4.release(), a5));
|
|
}
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
const MediaConstraintsInterface* a2,
|
|
rtc::scoped_ptr<cricket::PortAllocator> a3,
|
|
rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
|
|
PeerConnectionObserver* a5) override {
|
|
return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
|
rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot2, this,
|
|
a1, a2, a3.release(), a4.release(), a5));
|
|
}
|
|
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
|
|
CreateLocalMediaStream, const std::string&)
|
|
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
|
|
CreateAudioSource, const MediaConstraintsInterface*)
|
|
PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>,
|
|
CreateVideoSource, cricket::VideoCapturer*,
|
|
const MediaConstraintsInterface*)
|
|
PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
|
|
CreateVideoTrack, const std::string&, VideoSourceInterface*)
|
|
PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
|
|
CreateAudioTrack, const std::string&, AudioSourceInterface*)
|
|
PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile)
|
|
PROXY_METHOD0(void, StopAecDump)
|
|
PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile)
|
|
PROXY_METHOD0(void, StopRtcEventLog)
|
|
|
|
private:
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot1(
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
const MediaConstraintsInterface* a2,
|
|
PortAllocatorFactoryInterface* a3,
|
|
DtlsIdentityStoreInterface* a4,
|
|
PeerConnectionObserver* a5) {
|
|
rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
|
|
return c_->CreatePeerConnection(a1, a2, a3, std::move(ptr_a4), a5);
|
|
}
|
|
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot2(
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
const MediaConstraintsInterface* a2,
|
|
cricket::PortAllocator* a3,
|
|
DtlsIdentityStoreInterface* a4,
|
|
PeerConnectionObserver* a5) {
|
|
rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
|
|
rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
|
|
return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3),
|
|
std::move(ptr_a4), a5);
|
|
}
|
|
END_PROXY()
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
|