blob: 91e6d983819e9513a51afc65d6ce46c311c4e6fd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-04-19 13:02:56 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
@@ -1038,7 +1038,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
#endif
-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI)
// Linux should always use a custom allocator (to allocate buffers using
// libva) and a PlatformVideoFramePool.
CHECK(allocator.has_value());
@@ -1048,7 +1048,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
// to create NativePixmap-backed frames.
main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
*allocator, VideoFrame::STORAGE_GPU_MEMORY_BUFFER);
-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
// Linux w/ V4L2 should not use a custom allocator
// Only tested with video_decode_accelerator_tests
// TODO(wenst@) Test with full Chromium Browser
@@ -1206,7 +1206,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
<< " VideoFrames";
auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(nhebert): Change the storage type argument when |allocator| switches
// to create NativePixmap-backed frames.
auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
|
