Commit 8e5369a2 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert JpegEncodeAccelerator to new Mojo types

This CL converts JpegEncodeAccelerator to new Mojo types
using PendingReceiver.

Bug: 955171
Test: Pass libjea_test
Change-Id: Ib4ebdbe3a2f8d41808aad1179233a61b578fb2f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849691Reviewed-by: default avatarRicky Liang <jcliang@chromium.org>
Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarJonathan Backer <backer@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarWei Lee <wtlee@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#705843}
parent 717169f8
...@@ -36,7 +36,8 @@ void VideoCaptureDependencies::CreateJpegDecodeAccelerator( ...@@ -36,7 +36,8 @@ void VideoCaptureDependencies::CreateJpegDecodeAccelerator(
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// static // static
void VideoCaptureDependencies::CreateJpegEncodeAccelerator( void VideoCaptureDependencies::CreateJpegEncodeAccelerator(
chromeos_camera::mojom::JpegEncodeAcceleratorRequest accelerator) { mojo::PendingReceiver<chromeos_camera::mojom::JpegEncodeAccelerator>
accelerator) {
if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
base::PostTask( base::PostTask(
FROM_HERE, {BrowserThread::IO}, FROM_HERE, {BrowserThread::IO},
......
...@@ -18,7 +18,8 @@ class CONTENT_EXPORT VideoCaptureDependencies { ...@@ -18,7 +18,8 @@ class CONTENT_EXPORT VideoCaptureDependencies {
mojo::PendingReceiver<chromeos_camera::mojom::MjpegDecodeAccelerator> mojo::PendingReceiver<chromeos_camera::mojom::MjpegDecodeAccelerator>
accelerator); accelerator);
static void CreateJpegEncodeAccelerator( static void CreateJpegEncodeAccelerator(
chromeos_camera::mojom::JpegEncodeAcceleratorRequest accelerator); mojo::PendingReceiver<chromeos_camera::mojom::JpegEncodeAccelerator>
accelerator);
}; };
} // namespace content } // namespace content
......
...@@ -202,8 +202,9 @@ void CameraHalDispatcherImpl::GetJpegDecodeAccelerator( ...@@ -202,8 +202,9 @@ void CameraHalDispatcherImpl::GetJpegDecodeAccelerator(
} }
void CameraHalDispatcherImpl::GetJpegEncodeAccelerator( void CameraHalDispatcherImpl::GetJpegEncodeAccelerator(
chromeos_camera::mojom::JpegEncodeAcceleratorRequest jea_request) { mojo::PendingReceiver<chromeos_camera::mojom::JpegEncodeAccelerator>
jea_factory_.Run(std::move(jea_request)); jea_receiver) {
jea_factory_.Run(std::move(jea_receiver));
} }
void CameraHalDispatcherImpl::OnTraceLogEnabled() { void CameraHalDispatcherImpl::OnTraceLogEnabled() {
......
...@@ -32,7 +32,7 @@ class WaitableEvent; ...@@ -32,7 +32,7 @@ class WaitableEvent;
namespace media { namespace media {
using MojoJpegEncodeAcceleratorFactoryCB = base::RepeatingCallback<void( using MojoJpegEncodeAcceleratorFactoryCB = base::RepeatingCallback<void(
chromeos_camera::mojom::JpegEncodeAcceleratorRequest)>; mojo::PendingReceiver<chromeos_camera::mojom::JpegEncodeAccelerator>)>;
class CAPTURE_EXPORT CameraClientObserver { class CAPTURE_EXPORT CameraClientObserver {
public: public:
...@@ -70,7 +70,8 @@ class CAPTURE_EXPORT CameraHalDispatcherImpl final ...@@ -70,7 +70,8 @@ class CAPTURE_EXPORT CameraHalDispatcherImpl final
mojo::PendingReceiver<chromeos_camera::mojom::MjpegDecodeAccelerator> mojo::PendingReceiver<chromeos_camera::mojom::MjpegDecodeAccelerator>
jda_receiver) final; jda_receiver) final;
void GetJpegEncodeAccelerator( void GetJpegEncodeAccelerator(
chromeos_camera::mojom::JpegEncodeAcceleratorRequest jea_request) final; mojo::PendingReceiver<chromeos_camera::mojom::JpegEncodeAccelerator>
jea_receiver) final;
// base::trace_event::TraceLog::EnabledStateObserver implementation. // base::trace_event::TraceLog::EnabledStateObserver implementation.
void OnTraceLogEnabled() final; void OnTraceLogEnabled() final;
......
...@@ -34,7 +34,7 @@ interface CameraHalDispatcher { ...@@ -34,7 +34,7 @@ interface CameraHalDispatcher {
// Get JpegEncodeAccelerator from dispatcher. // Get JpegEncodeAccelerator from dispatcher.
[MinVersion=2] GetJpegEncodeAccelerator@3( [MinVersion=2] GetJpegEncodeAccelerator@3(
chromeos_camera.mojom.JpegEncodeAccelerator& jea_request); pending_receiver<chromeos_camera.mojom.JpegEncodeAccelerator> jea_receiver);
}; };
// The CrOS camera HAL v3 Mojo server. // The CrOS camera HAL v3 Mojo server.
......
...@@ -268,8 +268,8 @@ class VideoCaptureDeviceTest ...@@ -268,8 +268,8 @@ class VideoCaptureDeviceTest
CameraHalDispatcherImpl::GetInstance()->Start( CameraHalDispatcherImpl::GetInstance()->Start(
base::DoNothing::Repeatedly<mojo::PendingReceiver< base::DoNothing::Repeatedly<mojo::PendingReceiver<
chromeos_camera::mojom::MjpegDecodeAccelerator>>(), chromeos_camera::mojom::MjpegDecodeAccelerator>>(),
base::DoNothing::Repeatedly< base::DoNothing::Repeatedly<mojo::PendingReceiver<
chromeos_camera::mojom::JpegEncodeAcceleratorRequest>()); chromeos_camera::mojom::JpegEncodeAccelerator>>());
} }
#endif #endif
video_capture_device_factory_ = video_capture_device_factory_ =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment