generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 68495561-> 68499439

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6319 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-03 23:43:48 +00:00
parent 09a71cd9ce
commit 251fdf64cb
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
talk/media/webrtc/webrtcmediaengine.h
View File

@ -175,6 +175,9 @@ class WebRtcMediaEngine : public cricket::MediaEngineInterface {
#else #else
#include "talk/media/webrtc/webrtcvideoengine.h" #include "talk/media/webrtc/webrtcvideoengine.h"
#ifdef WEBRTC_CHROMIUM_BUILD
#include "talk/media/webrtc/webrtcvideoengine2.h"
#endif
#include "talk/media/webrtc/webrtcvoiceengine.h" #include "talk/media/webrtc/webrtcvoiceengine.h"
namespace cricket { namespace cricket {
@ -195,6 +198,23 @@ class WebRtcMediaEngine : public WebRtcCompositeMediaEngine {
} }
}; };
#ifdef WEBRTC_CHROMIUM_BUILD
typedef CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2>
WebRtcCompositeMediaEngine2;
class WebRtcMediaEngine2 : public WebRtcCompositeMediaEngine2 {
public:
WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
webrtc::AudioDeviceModule* adm_sc,
WebRtcVideoEncoderFactory* encoder_factory,
WebRtcVideoDecoderFactory* decoder_factory) {
voice_.SetAudioDeviceModule(adm, adm_sc);
video_.SetVoiceEngine(&voice_);
video_.EnableTimedRender();
}
};
#endif
} // namespace cricket } // namespace cricket
#endif // !defined(LIBPEERCONNECTION_LIB) && #endif // !defined(LIBPEERCONNECTION_LIB) &&

26
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -62,6 +62,9 @@
#include "talk/media/webrtc/webrtcvoiceengine.h" #include "talk/media/webrtc/webrtcvoiceengine.h"
#include "webrtc/experiments.h" #include "webrtc/experiments.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#ifdef WEBRTC_CHROMIUM_BUILD
#include "webrtc/system_wrappers/interface/field_trial.h"
#endif
#if !defined(LIBPEERCONNECTION_LIB) #if !defined(LIBPEERCONNECTION_LIB)
#include "talk/media/webrtc/webrtcmediaengine.h" #include "talk/media/webrtc/webrtcmediaengine.h"
@ -71,13 +74,30 @@ cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
webrtc::AudioDeviceModule* adm, webrtc::AudioDeviceModule* adm_sc, webrtc::AudioDeviceModule* adm, webrtc::AudioDeviceModule* adm_sc,
cricket::WebRtcVideoEncoderFactory* encoder_factory, cricket::WebRtcVideoEncoderFactory* encoder_factory,
cricket::WebRtcVideoDecoderFactory* decoder_factory) { cricket::WebRtcVideoDecoderFactory* decoder_factory) {
return new cricket::WebRtcMediaEngine(adm, adm_sc, encoder_factory, #ifdef WEBRTC_CHROMIUM_BUILD
decoder_factory); if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") {
return new cricket::WebRtcMediaEngine2(
adm, adm_sc, encoder_factory, decoder_factory);
} else {
#endif
return new cricket::WebRtcMediaEngine(
adm, adm_sc, encoder_factory, decoder_factory);
#ifdef WEBRTC_CHROMIUM_BUILD
}
#endif
} }
WRME_EXPORT WRME_EXPORT
void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) { void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
delete static_cast<cricket::WebRtcMediaEngine*>(media_engine); #ifdef WEBRTC_CHROMIUM_BUILD
if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") {
delete static_cast<cricket::WebRtcMediaEngine2*>(media_engine);
} else {
#endif
delete static_cast<cricket::WebRtcMediaEngine*>(media_engine);
#ifdef WEBRTC_CHROMIUM_BUILD
}
#endif
} }
#endif #endif