diff options
author | dcheng <dcheng@chromium.org> | 2015-06-24 12:07:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 19:08:05 +0000 |
commit | 07cf16152edf2771e8788c1c3745bc287b8206cf (patch) | |
tree | 755cbe5f82136127bac4ed91818765972e48f9a7 /media/video/capture/video_capture_device.h | |
parent | c1cab0163fca4dad68c05c7f14567051730f27da (diff) | |
download | chromium_src-07cf16152edf2771e8788c1c3745bc287b8206cf.zip chromium_src-07cf16152edf2771e8788c1c3745bc287b8206cf.tar.gz chromium_src-07cf16152edf2771e8788c1c3745bc287b8206cf.tar.bz2 |
Revert of Video Capture: extract storage info from pixel format in VideoCaptureFormat. (patchset #7 id:290001 of https://codereview.chromium.org/1179323002/)
Reason for revert:
The IPC changes in this patch were not reviewed.
Original issue's description:
> Video Capture: extract storage info from pixel format in VideoCaptureFormat.
>
> Video Capture Devices treat both Texture and GpuMemoryBuffer
> as a VideoPixelFormat, but they are storage types. Moreover,
> this merging prevents capture devices from indicating a
> combination of Storage and Capture formats, i.e.
> Texture + ARGB, or GpuMemoryBuffer+YUY2.
>
> This CL separates both concepts and updates necessary
> call points. It also extends the translation
> VideoCaptureFormat --> VideoFrame in
> VideoCaptureDeviceClient and in VideoCaptureBufferPool.
> VideoCaptureBufferPool::ReserveOutputBuffer()
> also gets a param to specify the StorageType.
>
> This separation also allows for VideoCaptureBufferPool
> to operate using VideoPixel{Format, Storage} ISO
> VideoFrame types, which spares the constant conversion
> between ones and others.
>
> Test: All video captures working exactly as before.
> BUG=440843
>
> TBR=dcheng@chromium.org for media_param_traits.cc
> (Rationale: the change is small and I'm still going to be
> actively working in this area so we can follow up in
> other reviews).
>
> Committed: https://crrev.com/957fb245c45052e2c4b2bb0f59e165ba05096904
> Cr-Commit-Position: refs/heads/master@{#335872}
TBR=dalecurtis@chromium.org,hubbe@chromium.org,miu@chromium.org,mcasas@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440843
Review URL: https://codereview.chromium.org/1204843004
Cr-Commit-Position: refs/heads/master@{#335968}
Diffstat (limited to 'media/video/capture/video_capture_device.h')
-rw-r--r-- | media/video/capture/video_capture_device.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h index 7398316..59d91cf 100644 --- a/media/video/capture/video_capture_device.h +++ b/media/video/capture/video_capture_device.h @@ -247,9 +247,8 @@ class MEDIA_EXPORT VideoCaptureDevice { // The output buffer stays reserved and mapped for use until the Buffer // object is destroyed or returned. virtual scoped_ptr<Buffer> ReserveOutputBuffer( - const gfx::Size& dimensions, - VideoPixelFormat format, - VideoPixelStorage storage) = 0; + media::VideoPixelFormat format, + const gfx::Size& dimensions) = 0; // Captured new video data, held in |frame| or |buffer|, respectively for // OnIncomingCapturedVideoFrame() and OnIncomingCapturedBuffer(). |