Remove GetStartCaptureFormat and some related code.
It is no longer used by anything. R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/48039004 Cr-Commit-Position: refs/heads/master@{#8990}
This commit is contained in:
parent
6ae2572fa6
commit
77f0e3f7b6
@ -920,10 +920,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;
|
||||
|
||||
|
@ -149,9 +149,6 @@ class FileMediaEngine : public MediaEngineInterface {
|
||||
MediaProcessorDirection direction) {
|
||||
return true;
|
||||
}
|
||||
VideoFormat GetStartCaptureFormat() const {
|
||||
return VideoFormat();
|
||||
}
|
||||
|
||||
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
|
||||
SignalVideoCaptureStateChange() {
|
||||
|
@ -142,8 +142,6 @@ class MediaEngineInterface {
|
||||
VoiceProcessor* video_processor,
|
||||
MediaProcessorDirection direction) = 0;
|
||||
|
||||
virtual VideoFormat GetStartCaptureFormat() const = 0;
|
||||
|
||||
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
|
||||
SignalVideoCaptureStateChange() = 0;
|
||||
};
|
||||
@ -268,9 +266,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_;
|
||||
@ -349,7 +344,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:
|
||||
|
@ -173,9 +173,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
|
||||
return delegate_->UnregisterVoiceProcessor(ssrc, video_processor,
|
||||
direction);
|
||||
}
|
||||
VideoFormat GetStartCaptureFormat() const override {
|
||||
return delegate_->GetStartCaptureFormat();
|
||||
}
|
||||
virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
|
||||
SignalVideoCaptureStateChange() {
|
||||
return delegate_->SignalVideoCaptureStateChange();
|
||||
|
@ -180,8 +180,6 @@ class WebRtcVideoEngine : public sigslot::has_slots<> {
|
||||
webrtc::VideoCodec* out_codec);
|
||||
int GetNumOfChannels();
|
||||
|
||||
VideoFormat GetStartCaptureFormat() const { return default_codec_format_; }
|
||||
|
||||
rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); }
|
||||
|
||||
protected:
|
||||
|
@ -363,10 +363,6 @@ void DefaultUnsignalledSsrcHandler::SetDefaultRenderer(
|
||||
WebRtcVideoEngine2::WebRtcVideoEngine2(WebRtcVoiceEngine* voice_engine)
|
||||
: worker_thread_(NULL),
|
||||
voice_engine_(voice_engine),
|
||||
default_codec_format_(kDefaultVideoMaxWidth,
|
||||
kDefaultVideoMaxHeight,
|
||||
FPS_TO_INTERVAL(kDefaultVideoMaxFramerate),
|
||||
FOURCC_ANY),
|
||||
initialized_(false),
|
||||
call_factory_(&default_call_factory_),
|
||||
external_decoder_factory_(NULL),
|
||||
@ -434,11 +430,6 @@ bool WebRtcVideoEngine2::SetDefaultEncoderConfig(
|
||||
return false;
|
||||
}
|
||||
|
||||
default_codec_format_ =
|
||||
VideoFormat(codec.width,
|
||||
codec.height,
|
||||
VideoFormat::FpsToInterval(codec.framerate),
|
||||
FOURCC_ANY);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -152,8 +152,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_; }
|
||||
|
||||
private:
|
||||
std::vector<VideoCodec> GetSupportedCodecs() const;
|
||||
|
||||
@ -161,7 +159,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_;
|
||||
|
||||
|
@ -1013,11 +1013,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));
|
||||
|
@ -240,9 +240,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user