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

Unified Diff: content/browser/renderer_host/media/video_capture_controller.cc

Issue 13616004: Switch event type when a capture device has been stopped from the render process. This make sure th… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed code review comments. Created 7 years, 8 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_controller_event_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index f0469b5022cf3c96669b484f5fded3341676cadb..25d41a54d2a433c5f2d29ac46e757c2d38a9b301 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -211,7 +211,7 @@ void VideoCaptureController::StopSession(
if (client) {
client->session_closed = true;
- client->event_handler->OnPaused(client->controller_id);
+ client->event_handler->OnEnded(client->controller_id);
}
}
@@ -259,9 +259,9 @@ void VideoCaptureController::OnIncomingCapturedFrame(
int rotation,
bool flip_vert,
bool flip_horiz) {
- DCHECK (frame_info_.color == media::VideoCaptureCapability::kI420 ||
- frame_info_.color == media::VideoCaptureCapability::kYV12 ||
- (rotation == 0 && !flip_vert && !flip_horiz));
+ DCHECK(frame_info_.color == media::VideoCaptureCapability::kI420 ||
+ frame_info_.color == media::VideoCaptureCapability::kYV12 ||
+ (rotation == 0 && !flip_vert && !flip_horiz));
scoped_refptr<media::VideoFrame> dst;
{
« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_controller_event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698