media/video/capture/file_video_capture_device.cc - Issue 897483002: Refactored pixel format resize operations in media/video/capture into a function called VideoCaptu…

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: media/video/capture/file_video_capture_device.cc

Issue 897483002: Refactored pixel format resize operations in media/video/capture into a function called VideoCaptu… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed function to a public member. Added tests. Created 5 years, 11 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

« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | media/video/capture/video_capture_device_unittest.cc » ('j') | media/video/capture/video_capture_device_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/file_video_capture_device.cc

diff --git a/media/video/capture/file_video_capture_device.cc b/media/video/capture/file_video_capture_device.cc

index 24673aa45934d824faba863e65c650c925587f19..11172ca8f75e6f1821c112a59568057461c79ec1 100644

--- a/media/video/capture/file_video_capture_device.cc

+++ b/media/video/capture/file_video_capture_device.cc

@@ -10,6 +10,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_piece.h"

+#include "media/video/capture/video_capture_types.h"

namespace media {

static const int kY4MHeaderMaxSize = 200;

@@ -172,7 +173,7 @@ void FileVideoCaptureDevice::StopAndDeAllocate() {

int FileVideoCaptureDevice::CalculateFrameSize() {

mcasas 2015/02/03 20:48:46 I suspect this method can be made const (in the d

DCHECK_EQ(capture_format_.pixel_format, PIXEL_FORMAT_I420);

DCHECK_EQ(capture_thread_.message_loop(), base::MessageLoop::current());

- return capture_format_.frame_size.GetArea() * 12 / 8;

+ return capture_format_.ImageAllocationSize();

}

void FileVideoCaptureDevice::OnAllocateAndStart(