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

AndroidVideoCapturer: Remove unused member variable

Browse Source 
The member variable |current_state_| in AndroidVideoCapturer is
unnecessary. All state changes are reported to the base class
cricket::VideoCapturer that already holds the capture state.

R=sakal@webrtc.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/2104813003 .

Cr-Commit-Position: refs/heads/master@{#13341}
This commit is contained in:
Magnus Jedvert 2016-06-30 10:05:33 +02:00
parent 9e03c3b372
commit 77ed80a7ef
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/api/androidvideocapturer.cc
View File

@ -22,8 +22,7 @@ namespace webrtc {
AndroidVideoCapturer::AndroidVideoCapturer(
const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
: running_(false),
delegate_(delegate),
current_state_(cricket::CS_STOPPED) {
delegate_(delegate) {
thread_checker_.DetachFromThread();
SetSupportedFormats(delegate_->GetSupportedFormats());
}
@ -43,8 +42,7 @@ cricket::CaptureState AndroidVideoCapturer::Start(
running_ = true;
delegate_->Start(capture_format.width, capture_format.height, fps, this);
SetCaptureFormat(&capture_format);
current_state_ = cricket::CS_STARTING;
return current_state_;
return cricket::CS_STARTING;
}
void AndroidVideoCapturer::Stop() {
@ -55,8 +53,7 @@ void AndroidVideoCapturer::Stop() {
SetCaptureFormat(NULL);
delegate_->Stop();
current_state_ = cricket::CS_STOPPED;
SetCaptureState(current_state_);
SetCaptureState(cricket::CS_STOPPED);
}
bool AndroidVideoCapturer::IsRunning() {
@ -72,11 +69,8 @@ bool AndroidVideoCapturer::GetPreferredFourccs(std::vector<uint32_t>* fourccs) {
void AndroidVideoCapturer::OnCapturerStarted(bool success) {
RTC_CHECK(thread_checker_.CalledOnValidThread());
cricket::CaptureState new_state =
const cricket::CaptureState new_state =
success ? cricket::CS_RUNNING : cricket::CS_FAILED;
if (new_state == current_state_)
return;
current_state_ = new_state;
SetCaptureState(new_state);
}

2
webrtc/api/androidvideocapturer.h
View File

@ -77,8 +77,6 @@ class AndroidVideoCapturer : public cricket::VideoCapturer {
rtc::scoped_refptr<AndroidVideoCapturerDelegate> delegate_;
rtc::ThreadChecker thread_checker_;
cricket::CaptureState current_state_;
};
} // namespace webrtc