diff options
| author | phoglund <phoglund@chromium.org> | 2015-02-07 04:46:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-07 12:47:14 +0000 |
| commit | b22a69d1b11489dacacbf0a710337a94714ac3d0 (patch) | |
| tree | 35404ce30d0bf49587a00754b1bfc44c57e6ad36 /media/video/capture/file_video_capture_device.h | |
| parent | 03ba3b4bee3e84e248ea4b95a7a68ac887def09e (diff) | |
| download | chromium_src-b22a69d1b11489dacacbf0a710337a94714ac3d0.zip chromium_src-b22a69d1b11489dacacbf0a710337a94714ac3d0.tar.gz chromium_src-b22a69d1b11489dacacbf0a710337a94714ac3d0.tar.bz2 | |
Revert of Refactored pixel format resize operations in media/video/capture into a function called VideoCaptu… (patchset #13 id:240001 of https://codereview.chromium.org/897483002/)
Reason for revert:
This breaks the WebRTC real webcam tests on Windows. See for instance http://chromegw.corp.google.com/i/internal.chromium.webrtc/builders/Win7%20Tester/builds/13860. The error is
[2292:2232:0206/211958:997267:FATAL:video_capture_controller.cc(474)] Check failed: static_cast<size_t>(length) >= frame_format.ImageAllocationSize() (0 vs. 614400)
The Win bots are equipped with C920 webcams. I logged into the bot to make sure the webcam was working right - it is as far I can see.
Original issue's description:
> Refactored pixel format resize operations in media/video/capture into a function called VideoCaptureFormat::GetSizeForVideoPixelFormat().
>
> BUG=
>
> TEST=VideoCaptureDeviceTest.* in media_unittests pass.
>
> Committed: https://crrev.com/79288ba0b63021e8731e0401b8a4a9055d33fa10
> Cr-Commit-Position: refs/heads/master@{#315175}
TBR=mcasas@chromium.org,perkj@chromium.org,emircan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/898803004
Cr-Commit-Position: refs/heads/master@{#315203}
Diffstat (limited to 'media/video/capture/file_video_capture_device.h')
| -rw-r--r-- | media/video/capture/file_video_capture_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/video/capture/file_video_capture_device.h b/media/video/capture/file_video_capture_device.h index bd3b298..7b6cd1d 100644 --- a/media/video/capture/file_video_capture_device.h +++ b/media/video/capture/file_video_capture_device.h @@ -43,7 +43,7 @@ class MEDIA_EXPORT FileVideoCaptureDevice : public VideoCaptureDevice { private: // Returns size in bytes of an I420 frame, not including possible paddings, // defined by |capture_format_|. - int CalculateFrameSize() const; + int CalculateFrameSize(); // Called on the |capture_thread_|. void OnAllocateAndStart(const VideoCaptureParams& params, |