diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/base/video_frame.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/base/video_frame.cc')
| -rw-r--r-- | chromium/media/base/video_frame.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/media/base/video_frame.cc b/chromium/media/base/video_frame.cc index 0bb025a1d5f..a069012e49d 100644 --- a/chromium/media/base/video_frame.cc +++ b/chromium/media/base/video_frame.cc @@ -338,8 +338,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateVideoHoleFrame( scoped_refptr<VideoFrame> frame = new VideoFrame(*layout, StorageType::STORAGE_OPAQUE, gfx::Rect(natural_size), natural_size, timestamp); - frame->metadata()->SetUnguessableToken(VideoFrameMetadata::OVERLAY_PLANE_ID, - overlay_plane_id); + frame->metadata()->overlay_plane_id = overlay_plane_id; return frame; } @@ -366,7 +365,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTextures( if (format != PIXEL_FORMAT_ARGB && format != PIXEL_FORMAT_XRGB && format != PIXEL_FORMAT_NV12 && format != PIXEL_FORMAT_I420 && format != PIXEL_FORMAT_ABGR && format != PIXEL_FORMAT_XR30 && - format != PIXEL_FORMAT_XB30) { + format != PIXEL_FORMAT_XB30 && format != PIXEL_FORMAT_P016LE) { DLOG(ERROR) << "Unsupported pixel format: " << VideoPixelFormatToString(format); return nullptr; @@ -750,7 +749,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateEOSFrame() { } scoped_refptr<VideoFrame> frame = new VideoFrame( *layout, STORAGE_UNKNOWN, gfx::Rect(), gfx::Size(), kNoTimestamp); - frame->metadata()->SetBoolean(VideoFrameMetadata::END_OF_STREAM, true); + frame->metadata()->end_of_stream = true; return frame; } @@ -1119,7 +1118,7 @@ gpu::SyncToken VideoFrame::UpdateReleaseSyncToken(SyncTokenClient* client) { } std::string VideoFrame::AsHumanReadableString() const { - if (metadata()->IsTrue(VideoFrameMetadata::END_OF_STREAM)) + if (metadata()->end_of_stream) return "end of stream"; std::ostringstream s; |