zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland Remove unused cricket::VideoCapturer methods. Originally reviewed and landed as patchset #2 id:30001 of https://codereview.webrtc.org/1733673002/)

Browse Source 
I readded virtual bool Pause(bool paused) for now with a dummy implementation since Chrome remoting override this method.

Original cl description:

Removed unused cricket::VideoCapturer methods:

void UpdateAspectRatio(int ratio_w, int ratio_h);
void ClearAspectRatio();
bool Pause(bool paused);
Restart(const VideoFormat& capture_format);
MuteToBlackThenPause(bool muted);
IsMuted() const
set_square_pixel_aspect_ratio
bool square_pixel_aspect_ratio()

This cl also remove the use of messages and posting of state change.
Further more - a thread checker is added to make sure methods are called on only one thread. Construction can happen on a separate thred.
It does not add restrictions on what thread frames are delivered on though.

There is more features in VideoCapturer::Onframe related to screen share in ARGB that probably can be cleaned up in a follow up cl.

BUG=webrtc:5426
TBR=pthatcher@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#11809}
This commit is contained in:
Per
2016-02-29 12:07:35 +01:00
parent f3ed9d75dd
commit fb45d170c0
14 changed files with 50 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/api/androidvideocapturer.cc
View File

@ -152,7 +152,7 @@ void AndroidVideoCapturer::Stop() {
delegate_->Stop();
current_state_ = cricket::CS_STOPPED;
SignalStateChange(this, current_state_);
SetCaptureState(current_state_);
}
bool AndroidVideoCapturer::IsRunning() {
@ -173,11 +173,7 @@ void AndroidVideoCapturer::OnCapturerStarted(bool success) {
if (new_state == current_state_)
return;
current_state_ = new_state;
// TODO(perkj): SetCaptureState can not be used since it posts to |thread_|.
// But |thread_ | is currently just the thread that happened to create the
// cricket::VideoCapturer.
SignalStateChange(this, new_state);
SetCaptureState(new_state);
}
void AndroidVideoCapturer::OnIncomingFrame(