Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2335)

Unified Diff: content/renderer/media/local_video_capture.cc

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/local_video_capture.cc
===================================================================
--- content/renderer/media/local_video_capture.cc (revision 164646)
+++ content/renderer/media/local_video_capture.cc (working copy)
@@ -30,7 +30,7 @@
ALLOW_THIS_IN_INITIALIZER_LIST(
handler_proxy_(new media::VideoCaptureHandlerProxy(
this, message_loop_proxy_))),
- state_(video_capture::kStopped) {
+ state_(VIDEO_CAPTURE_STATE_STOPPED) {
DVLOG(3) << "LocalVideoCapture::ctor";
DCHECK(vc_manager);
}
@@ -42,10 +42,10 @@
void LocalVideoCapture::Start() {
DVLOG(3) << "LocalVideoCapture::Start";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
- DCHECK_EQ(state_, video_capture::kStopped);
+ DCHECK_EQ(state_, VIDEO_CAPTURE_STATE_STOPPED);
capture_engine_ = vc_manager_->AddDevice(video_stream_id_, this);
- state_ = video_capture::kStarted;
+ state_ = VIDEO_CAPTURE_STATE_STARTED;
AddRef(); // Will be balanced in OnRemoved().
capture_engine_->StartCapture(handler_proxy_.get(), capability_);
}
@@ -54,7 +54,7 @@
DVLOG(3) << "LocalVideoCapture::Stop";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
if (capture_engine_) {
- state_ = video_capture::kStopping;
+ state_ = VIDEO_CAPTURE_STATE_STOPPING;
capture_engine_->StopCapture(handler_proxy_.get());
capture_engine_ = NULL;
}
@@ -63,16 +63,16 @@
void LocalVideoCapture::Play() {
DVLOG(3) << "LocalVideoCapture::Play";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
- if (capture_engine_ && state_ == video_capture::kPaused) {
- state_ = video_capture::kStarted;
+ if (capture_engine_ && state_ == VIDEO_CAPTURE_STATE_PAUSED) {
+ state_ = VIDEO_CAPTURE_STATE_STARTED;
}
}
void LocalVideoCapture::Pause() {
DVLOG(3) << "LocalVideoCapture::Pause";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
- if (capture_engine_ && state_ == video_capture::kStarted) {
- state_ = video_capture::kPaused;
+ if (capture_engine_ && state_ == VIDEO_CAPTURE_STATE_STARTED) {
+ state_ = VIDEO_CAPTURE_STATE_PAUSED;
}
}
@@ -119,7 +119,7 @@
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
DCHECK(buf);
- if (state_ != video_capture::kStarted) {
+ if (state_ != VIDEO_CAPTURE_STATE_STARTED) {
capture->FeedBuffer(buf);
return;
}

Powered by Google App Engine
This is Rietveld 408576698