diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
| commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
| tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/services/video_capture/receiver_mojo_to_media_adapter.cc | |
| parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
| download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz | |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/services/video_capture/receiver_mojo_to_media_adapter.cc')
| -rw-r--r-- | chromium/services/video_capture/receiver_mojo_to_media_adapter.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/services/video_capture/receiver_mojo_to_media_adapter.cc b/chromium/services/video_capture/receiver_mojo_to_media_adapter.cc index 737d632a136..3c51cac3f10 100644 --- a/chromium/services/video_capture/receiver_mojo_to_media_adapter.cc +++ b/chromium/services/video_capture/receiver_mojo_to_media_adapter.cc @@ -16,12 +16,9 @@ ReceiverMojoToMediaAdapter::ReceiverMojoToMediaAdapter( ReceiverMojoToMediaAdapter::~ReceiverMojoToMediaAdapter() = default; void ReceiverMojoToMediaAdapter::OnIncomingCapturedVideoFrame( - std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer, + media::VideoCaptureDevice::Client::Buffer buffer, scoped_refptr<media::VideoFrame> frame) { - // O: |frame| should already be backed by a MojoSharedBufferVideoFrame - // assuming we have used the correct buffer factory with the pool. - auto video_frame_ptr = media::mojom::VideoFrame::From(std::move(frame)); - receiver_->OnIncomingCapturedVideoFrame(std::move(video_frame_ptr)); + NOTIMPLEMENTED(); } void ReceiverMojoToMediaAdapter::OnError() { |