diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-12 15:59:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-25 06:57:22 +0000 |
| commit | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (patch) | |
| tree | caed19b2af2024f35449fb0b781d0a25e09d4f8f /chromium/media/capture/video/video_capture_device_client.cc | |
| parent | 9729c4479fe23554eae6e6dd1f30ff488f470c84 (diff) | |
| download | qtwebengine-chromium-f7eaed5286974984ba5f9e3189d8f49d03e99f81.tar.gz | |
BASELINE: Update Chromium to 100.0.4896.167
Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/capture/video/video_capture_device_client.cc')
| -rw-r--r-- | chromium/media/capture/video/video_capture_device_client.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/media/capture/video/video_capture_device_client.cc b/chromium/media/capture/video/video_capture_device_client.cc index 91b170df398..bad82eb634b 100644 --- a/chromium/media/capture/video/video_capture_device_client.cc +++ b/chromium/media/capture/video/video_capture_device_client.cc @@ -320,14 +320,14 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) fourcc_format = libyuv::FOURCC_RAW; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) fourcc_format = libyuv::FOURCC_24BG; #else NOTREACHED() << "RGB24 is only available in Linux and Windows platforms"; #endif -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // TODO(wjia): Currently, for RGB24 on WIN, capture device always passes // in positive src_width and src_height. Remove this hardcoded value when // negative src_height is supported. The negative src_height indicates @@ -572,7 +572,7 @@ VideoCaptureDeviceClient::ReserveOutputBuffer(const gfx::Size& frame_size, media::mojom::VideoBufferHandlePtr buffer_handle = media::mojom::VideoBufferHandle::New(); VideoCaptureBufferType target_buffer_type = target_buffer_type_; -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // If MediaFoundationD3D11VideoCapture fails, a shared memory buffer may be // sent instead. if (target_buffer_type == VideoCaptureBufferType::kGpuMemoryBuffer && |