| Index: device/capture/video/win/sink_input_pin_win.cc
|
| diff --git a/media/capture/video/win/sink_input_pin_win.cc b/device/capture/video/win/sink_input_pin_win.cc
|
| similarity index 91%
|
| rename from media/capture/video/win/sink_input_pin_win.cc
|
| rename to device/capture/video/win/sink_input_pin_win.cc
|
| index 0abd0a785c10cc83c3969d8de5f29502ec72f01a..929d33473a5b7ec7b749a00dc6d236e43ee23c68 100644
|
| --- a/media/capture/video/win/sink_input_pin_win.cc
|
| +++ b/device/capture/video/win/sink_input_pin_win.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/capture/video/win/sink_input_pin_win.h"
|
| +#include "device/capture/video/win/sink_input_pin_win.h"
|
|
|
| #include <cstring>
|
|
|
| @@ -15,7 +15,7 @@
|
| #include "base/macros.h"
|
| #include "media/base/timestamp_constants.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| const REFERENCE_TIME kSecondsToReferenceTime = 10000000;
|
|
|
| @@ -36,7 +36,7 @@ void SinkInputPin::SetRequestedMediaFormat(
|
| requested_info_header_ = info_header;
|
| resulting_format_.frame_size.SetSize(0, 0);
|
| resulting_format_.frame_rate = 0;
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_UNKNOWN;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_UNKNOWN;
|
| }
|
|
|
| bool SinkInputPin::IsMediaTypeValid(const AM_MEDIA_TYPE* media_type) {
|
| @@ -66,33 +66,33 @@ bool SinkInputPin::IsMediaTypeValid(const AM_MEDIA_TYPE* media_type) {
|
| }
|
| if (sub_type == kMediaSubTypeI420 &&
|
| pvi->bmiHeader.biCompression == MAKEFOURCC('I', '4', '2', '0')) {
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_I420;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_I420;
|
| return true;
|
| }
|
| if (sub_type == MEDIASUBTYPE_YUY2 &&
|
| pvi->bmiHeader.biCompression == MAKEFOURCC('Y', 'U', 'Y', '2')) {
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_YUY2;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_YUY2;
|
| return true;
|
| }
|
| // This format is added after http:/crbug.com/508413.
|
| if (sub_type == MEDIASUBTYPE_UYVY &&
|
| pvi->bmiHeader.biCompression == MAKEFOURCC('U', 'Y', 'V', 'Y')) {
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_UYVY;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_UYVY;
|
| return true;
|
| }
|
| if (sub_type == MEDIASUBTYPE_MJPG &&
|
| pvi->bmiHeader.biCompression == MAKEFOURCC('M', 'J', 'P', 'G')) {
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_MJPEG;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_MJPEG;
|
| return true;
|
| }
|
| if (sub_type == MEDIASUBTYPE_RGB24 &&
|
| pvi->bmiHeader.biCompression == BI_RGB) {
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_RGB24;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_RGB24;
|
| return true;
|
| }
|
| if (sub_type == MEDIASUBTYPE_RGB32 &&
|
| pvi->bmiHeader.biCompression == BI_RGB) {
|
| - resulting_format_.pixel_format = PIXEL_FORMAT_RGB32;
|
| + resulting_format_.pixel_format = media::PIXEL_FORMAT_RGB32;
|
| return true;
|
| }
|
|
|
| @@ -123,7 +123,7 @@ bool SinkInputPin::GetValidMediaType(int index, AM_MEDIA_TYPE* media_type) {
|
| media_type->formattype = FORMAT_VideoInfo;
|
| media_type->bTemporalCompression = FALSE;
|
|
|
| - if (requested_pixel_format_ == PIXEL_FORMAT_MJPEG) {
|
| + if (requested_pixel_format_ == media::PIXEL_FORMAT_MJPEG) {
|
| // If the requested pixel format is MJPEG, accept only MJPEG.
|
| // This is ok since the capabilities of the capturer have been
|
| // enumerated and we know that it is supported.
|
| @@ -215,4 +215,4 @@ HRESULT SinkInputPin::Receive(IMediaSample* sample) {
|
| SinkInputPin::~SinkInputPin() {
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|