admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Auto)update libjingle 74825084-> 74825992

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7074 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-09-05 00:14:03 +00:00
parent dfbcf8161e
commit 818b7b3ac9
9 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/media/base/fakemediaengine.h
View File

@ -930,10 +930,6 @@ class FakeVideoEngine : public FakeBaseEngine {
capture_ = capture;
return true;
}
VideoFormat GetStartCaptureFormat() const {
return VideoFormat(640, 480, cricket::VideoFormat::FpsToInterval(30),
FOURCC_I420);
}
sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;

3
talk/media/base/filemediaengine.h
View File

@ -150,9 +150,6 @@ class FileMediaEngine : public MediaEngineInterface {
MediaProcessorDirection direction) {
return true;
}
VideoFormat GetStartCaptureFormat() const {
return VideoFormat();
}
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
SignalVideoCaptureStateChange() {

6
talk/media/base/mediaengine.h
View File

@ -147,8 +147,6 @@ class MediaEngineInterface {
VoiceProcessor* video_processor,
MediaProcessorDirection direction) = 0;
virtual VideoFormat GetStartCaptureFormat() const = 0;
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
SignalVideoCaptureStateChange() = 0;
};
@ -278,9 +276,6 @@ class CompositeMediaEngine : public MediaEngineInterface {
MediaProcessorDirection direction) {
return voice_.UnregisterProcessor(ssrc, processor, direction);
}
virtual VideoFormat GetStartCaptureFormat() const {
return video_.GetStartCaptureFormat();
}
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
SignalVideoCaptureStateChange() {
return signal_state_change_;
@ -361,7 +356,6 @@ class NullVideoEngine {
return rtp_header_extensions_;
}
void SetLogging(int min_sev, const char* filter) {}
VideoFormat GetStartCaptureFormat() const { return VideoFormat(); }
sigslot::signal2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
private:

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

@ -185,9 +185,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
return delegate_->UnregisterVoiceProcessor(ssrc, video_processor,
direction);
}
virtual VideoFormat GetStartCaptureFormat() const OVERRIDE {
return delegate_->GetStartCaptureFormat();
}
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
SignalVideoCaptureStateChange() {
return delegate_->SignalVideoCaptureStateChange();

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

@ -169,8 +169,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
bool ShouldIgnoreTrace(const std::string& trace);
int GetNumOfChannels();
VideoFormat GetStartCaptureFormat() const { return default_codec_format_; }
rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); }
protected:

9
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -286,10 +286,6 @@ WebRtcVideoEngine2::WebRtcVideoEngine2()
: worker_thread_(NULL),
voice_engine_(NULL),
video_codecs_(DefaultVideoCodecs()),
default_codec_format_(kDefaultVideoCodecPref.width,
kDefaultVideoCodecPref.height,
FPS_TO_INTERVAL(kDefaultFramerate),
FOURCC_ANY),
initialized_(false),
cpu_monitor_(new rtc::CpuMonitor(NULL)),
channel_factory_(NULL) {
@ -358,11 +354,6 @@ bool WebRtcVideoEngine2::SetDefaultEncoderConfig(
return false;
}
default_codec_format_ =
VideoFormat(codec.width,
codec.height,
VideoFormat::FpsToInterval(codec.framerate),
FOURCC_ANY);
video_codecs_.clear();
video_codecs_.push_back(codec);
return true;

3
talk/media/webrtc/webrtcvideoengine2.h
View File

@ -168,8 +168,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> {
// Check whether the supplied trace should be ignored.
bool ShouldIgnoreTrace(const std::string& trace);
VideoFormat GetStartCaptureFormat() const { return default_codec_format_; }
rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); }
virtual WebRtcVideoEncoderFactory2* GetVideoEncoderFactory();
@ -179,7 +177,6 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> {
WebRtcVoiceEngine* voice_engine_;
std::vector<VideoCodec> video_codecs_;
std::vector<RtpHeaderExtension> rtp_header_extensions_;
VideoFormat default_codec_format_;
bool initialized_;

33
talk/session/media/channelmanager.cc
View File

@ -724,16 +724,28 @@ bool ChannelManager::SetCaptureDevice_w(const Device* cam_device) {
}
bool ChannelManager::SetDefaultVideoEncoderConfig(const VideoEncoderConfig& c) {
bool ret = true;
return worker_thread_->Invoke<bool>(
Bind(&ChannelManager::SetDefaultVideoEncoderConfig_w, this, c));
}
VideoEncoderConfig ChannelManager::GetDefaultVideoEncoderConfig() const {
return worker_thread_->Invoke<VideoEncoderConfig>(
Bind(&ChannelManager::GetDefaultVideoEncoderConfig_w, this));
}
bool ChannelManager::SetDefaultVideoEncoderConfig_w(
const VideoEncoderConfig& c) {
if (initialized_) {
ret = worker_thread_->Invoke<bool>(
Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig,
media_engine_.get(), c));
if (!media_engine_->SetDefaultVideoEncoderConfig(c)) {
return false;
}
}
if (ret) {
default_video_encoder_config_ = c;
}
return ret;
default_video_encoder_config_ = c;
return true;
}
VideoEncoderConfig ChannelManager::GetDefaultVideoEncoderConfig_w() const {
return default_video_encoder_config_;
}
bool ChannelManager::SetLocalMonitor(bool enable) {
@ -945,11 +957,6 @@ void ChannelManager::SetVideoCaptureDeviceMaxFormat(
device_manager_->SetVideoCaptureDeviceMaxFormat(usb_id, max_format);
}
VideoFormat ChannelManager::GetStartCaptureFormat() {
return worker_thread_->Invoke<VideoFormat>(
Bind(&MediaEngineInterface::GetStartCaptureFormat, media_engine_.get()));
}
bool ChannelManager::StartAecDump(rtc::PlatformFile file) {
return worker_thread_->Invoke<bool>(
Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file));

7
talk/session/media/channelmanager.h
View File

@ -163,6 +163,7 @@ class ChannelManager : public rtc::MessageHandler,
VideoCapturer* CreateScreenCapturer(const ScreencastId& screenid);
bool SetCaptureDevice(const std::string& cam_device);
bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config);
VideoEncoderConfig GetDefaultVideoEncoderConfig() const;
// RTX will be enabled/disabled in engines that support it. The supporting
// engines will start offering an RTX codec. Must be called before Init().
bool SetVideoRtxEnabled(bool enable);
@ -230,10 +231,6 @@ class ChannelManager : public rtc::MessageHandler,
// This API is mainly a hook used by unittests.
const std::string& video_device_name() const { return video_device_name_; }
// TODO(hellner): Remove this function once the engine capturer has been
// removed.
VideoFormat GetStartCaptureFormat();
protected:
// Adds non-transient parameters which can only be changed through the
// options store.
@ -282,6 +279,8 @@ class ChannelManager : public rtc::MessageHandler,
bool UnregisterVideoProcessor_w(VideoCapturer* capturer,
VideoProcessor* processor);
bool IsScreencastRunning_w() const;
bool SetDefaultVideoEncoderConfig_w(const VideoEncoderConfig& config);
VideoEncoderConfig GetDefaultVideoEncoderConfig_w() const;
virtual void OnMessage(rtc::Message *message);
rtc::scoped_ptr<MediaEngineInterface> media_engine_;