summaryrefslogtreecommitdiff
path: root/chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc')
-rw-r--r--chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc b/chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
index 62978d30410..0954dd8fda5 100644
--- a/chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
+++ b/chromium/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
@@ -69,8 +69,13 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFrameMapper::Map(
video_frame->timestamp());
}
- if (!mapped_frame)
+ if (!mapped_frame) {
+ gmb->Unmap();
return nullptr;
+ }
+
+ mapped_frame->set_color_space(video_frame->ColorSpace());
+ mapped_frame->metadata().MergeMetadataFrom(video_frame->metadata());
// Pass |video_frame| so that it outlives |mapped_frame| and the mapped buffer
// is unmapped on destruction.