content/browser/renderer_host/media/video_capture_controller.cc - Issue 1191443003: VideoCaptureParams: add flag for hinting capture using GpuMemoryBuffers & flag for it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1191443003: VideoCaptureParams: add flag for hinting capture using GpuMemoryBuffers & flag for it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added #include "build/build_config.h" Created 5 years, 6 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 | « content/browser/media/capture/content_video_capture_device_core.h ('k') | content/browser/renderer_host/media/video_capture_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 c60a99e0194e0f1b48a1cb970c486cabc650e4fc..05636438f151b3fe0827ba6b64f9b6077ffc5e2b 100644

--- a/content/browser/renderer_host/media/video_capture_controller.cc

+++ b/content/browser/renderer_host/media/video_capture_controller.cc

@@ -347,7 +347,7 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(

break;

}

- bool inserted =

+ const bool inserted =

client->active_buffers.insert(std::make_pair(buffer_id, frame))

.second;

DCHECK(inserted) << "Unexpected duplicate buffer: " << buffer_id;

@@ -363,10 +363,11 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(

UMA_HISTOGRAM_ASPECT_RATIO("Media.VideoCapture.AspectRatio",

frame->visible_rect().width(),

frame->visible_rect().height());

- double frame_rate;

+ double frame_rate = 0.0f;

if (!frame->metadata()->GetDouble(media::VideoFrameMetadata::FRAME_RATE,

- &frame_rate))

+ &frame_rate)) {

frame_rate = video_capture_format_.frame_rate;

+ }

UMA_HISTOGRAM_COUNTS("Media.VideoCapture.FrameRate", frame_rate);

has_received_frames_ = true;

}