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

(Auto)update libjingle 75854418-> 75854833

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7232 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-09-18 23:31:03 +00:00
parent dcc1f0426b
commit ccb3e3f3db
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ bool Changed(cricket::Settable<T> proposed,
T* value) {
return proposed.Get(value) && proposed != original;
}
} // namespace
namespace cricket {
@ -2950,7 +2951,6 @@ bool WebRtcVideoMediaChannel::SetOptions(const VideoOptions &options) {
if (send_codec_) {
webrtc::VideoCodec new_codec = *send_codec_;
bool conference_mode_turned_off = (
original.conference_mode.IsSet() &&
options.conference_mode.IsSet() &&
@ -2969,7 +2969,6 @@ bool WebRtcVideoMediaChannel::SetOptions(const VideoOptions &options) {
new_codec.startBitrate = new_start_bitrate;
}
if (!SetSendCodec(new_codec)) {
return false;
}

10
talk/media/webrtc/webrtcvideoengine.h
View File

@ -101,7 +101,7 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
ViEWrapper* vie_wrapper,
ViETraceWrapper* tracing,
rtc::CpuMonitor* cpu_monitor);
~WebRtcVideoEngine();
virtual ~WebRtcVideoEngine();
// Basic video engine implementation.
bool Init(rtc::Thread* worker_thread);
@ -129,7 +129,8 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
// Set a WebRtcVideoEncoderFactory for external encoding. Video engine does
// not take the ownership of |encoder_factory|. The caller needs to make sure
// that |encoder_factory| outlives the video engine.
void SetExternalEncoderFactory(WebRtcVideoEncoderFactory* encoder_factory);
virtual void SetExternalEncoderFactory(
WebRtcVideoEncoderFactory* encoder_factory);
// Enable the render module with timing control.
bool EnableTimedRender();
@ -217,9 +218,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
WebRtcVoiceEngine* voice_engine_;
rtc::scoped_ptr<webrtc::VideoRender> render_module_;
WebRtcVideoEncoderFactory* encoder_factory_;
// If the engine owns the encoder factory, set it here so it will be
// deleted.
rtc::scoped_ptr<WebRtcVideoEncoderFactory> owned_encoder_factory_;
WebRtcVideoDecoderFactory* decoder_factory_;
std::vector<VideoCodec> video_codecs_;
std::vector<RtpHeaderExtension> rtp_header_extensions_;
@ -240,7 +238,7 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler,
public:
WebRtcVideoMediaChannel(WebRtcVideoEngine* engine,
VoiceMediaChannel* voice_channel);
~WebRtcVideoMediaChannel();
virtual ~WebRtcVideoMediaChannel();
bool Init();
WebRtcVideoEngine* engine() { return engine_; }