Remove VCM debug recordings.
BUG=1695
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/46299004
Cr-Commit-Position: refs/heads/master@{#9233}
diff --git a/webrtc/modules/video_coding/main/interface/video_coding.h b/webrtc/modules/video_coding/main/interface/video_coding.h
index 55aa0cb..f8df9bf 100644
--- a/webrtc/modules/video_coding/main/interface/video_coding.h
+++ b/webrtc/modules/video_coding/main/interface/video_coding.h
@@ -534,12 +534,6 @@
// delayed by at least desired_delay_ms.
virtual int SetMinReceiverDelay(int desired_delay_ms) = 0;
- // Enables recording of debugging information.
- virtual int StartDebugRecording(const char* file_name_utf8) = 0;
-
- // Disables recording of debugging information.
- virtual int StopDebugRecording() = 0;
-
// Lets the sender suspend video when the rate drops below
// |threshold_bps|, and turns back on when the rate goes back up above
// |threshold_bps| + |window_bps|.
diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.cc b/webrtc/modules/video_coding/main/source/video_coding_impl.cc
index 6bccd60..a020d35 100644
--- a/webrtc/modules/video_coding/main/source/video_coding_impl.cc
+++ b/webrtc/modules/video_coding/main/source/video_coding_impl.cc
@@ -191,15 +191,6 @@
return sender_->SentFrameCount(&frameCount);
}
- int StartDebugRecording(const char* file_name_utf8) override {
- return sender_->StartDebugRecording(file_name_utf8);
- }
-
- int StopDebugRecording() override {
- sender_->StopDebugRecording();
- return VCM_OK;
- }
-
void SuspendBelowMinBitrate() override {
return sender_->SuspendBelowMinBitrate();
}
diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.h b/webrtc/modules/video_coding/main/source/video_coding_impl.h
index da3f07d..3c078d5 100644
--- a/webrtc/modules/video_coding/main/source/video_coding_impl.h
+++ b/webrtc/modules/video_coding/main/source/video_coding_impl.h
@@ -34,8 +34,6 @@
namespace vcm {
-class DebugRecorder;
-
class VCMProcessTimer {
public:
VCMProcessTimer(int64_t periodMs, Clock* clock)
@@ -108,9 +106,6 @@
int32_t IntraFrameRequest(int stream_index);
int32_t EnableFrameDropper(bool enable);
- int StartDebugRecording(const char* file_name_utf8);
- void StopDebugRecording();
-
void SuspendBelowMinBitrate();
bool VideoSuspended() const;
@@ -120,8 +115,6 @@
private:
Clock* clock_;
- rtc::scoped_ptr<DebugRecorder> recorder_;
-
rtc::scoped_ptr<CriticalSectionWrapper> process_crit_sect_;
CriticalSectionWrapper* _sendCritSect;
VCMGenericEncoder* _encoder;
diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index 4d368b5..e229575 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -24,48 +24,11 @@
namespace webrtc {
namespace vcm {
-class DebugRecorder {
- public:
- DebugRecorder()
- : cs_(CriticalSectionWrapper::CreateCriticalSection()), file_(nullptr) {}
-
- ~DebugRecorder() { Stop(); }
-
- int Start(const char* file_name_utf8) {
- CriticalSectionScoped cs(cs_.get());
- if (file_)
- fclose(file_);
- file_ = fopen(file_name_utf8, "wb");
- if (!file_)
- return VCM_GENERAL_ERROR;
- return VCM_OK;
- }
-
- void Stop() {
- CriticalSectionScoped cs(cs_.get());
- if (file_) {
- fclose(file_);
- file_ = nullptr;
- }
- }
-
- void Add(const I420VideoFrame& frame) {
- CriticalSectionScoped cs(cs_.get());
- if (file_)
- PrintI420VideoFrame(frame, file_);
- }
-
- private:
- rtc::scoped_ptr<CriticalSectionWrapper> cs_;
- FILE* file_ GUARDED_BY(cs_);
-};
-
VideoSender::VideoSender(Clock* clock,
EncodedImageCallback* post_encode_callback,
VideoEncoderRateObserver* encoder_rate_observer,
VCMQMSettingsCallback* qm_settings_callback)
: clock_(clock),
- recorder_(new DebugRecorder()),
process_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
_sendCritSect(CriticalSectionWrapper::CreateCriticalSection()),
_encoder(nullptr),
@@ -360,7 +323,6 @@
}
int32_t ret =
_encoder->Encode(videoFrame, codecSpecificInfo, _nextFrameTypes);
- recorder_->Add(videoFrame);
if (ret < 0) {
LOG(LS_ERROR) << "Failed to encode frame. Error code: " << ret;
return ret;
@@ -395,14 +357,6 @@
return VCM_OK;
}
-int VideoSender::StartDebugRecording(const char* file_name_utf8) {
- return recorder_->Start(file_name_utf8);
-}
-
-void VideoSender::StopDebugRecording() {
- recorder_->Stop();
-}
-
void VideoSender::SuspendBelowMinBitrate() {
DCHECK(main_thread_.CalledOnValidThread());
int threshold_bps;
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index 285712c..51231a8 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -854,14 +854,6 @@
}
}
-int ViEEncoder::StartDebugRecording(const char* fileNameUTF8) {
- return vcm_->StartDebugRecording(fileNameUTF8);
-}
-
-int ViEEncoder::StopDebugRecording() {
- return vcm_->StopDebugRecording();
-}
-
void ViEEncoder::SuspendBelowMinBitrate() {
vcm_->SuspendBelowMinBitrate();
bitrate_allocator_->EnforceMinBitrate(false);
diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h
index 2e208b5..675d40a 100644
--- a/webrtc/video_engine/vie_encoder.h
+++ b/webrtc/video_engine/vie_encoder.h
@@ -172,12 +172,6 @@
void SetMinTransmitBitrate(int min_transmit_bitrate_kbps);
- // Enables recording of debugging information.
- int StartDebugRecording(const char* fileNameUTF8);
-
- // Disables recording of debugging information.
- int StopDebugRecording();
-
// Lets the sender suspend video when the rate drops below
// |threshold_bps|, and turns back on when the rate goes back up above
// |threshold_bps| + |window_bps|.
