summaryrefslogtreecommitdiff
path: root/chromium/media/base/bitstream_buffer.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/media/base/bitstream_buffer.cc
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
downloadqtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/media/base/bitstream_buffer.cc')
-rw-r--r--chromium/media/base/bitstream_buffer.cc29
1 files changed, 24 insertions, 5 deletions
diff --git a/chromium/media/base/bitstream_buffer.cc b/chromium/media/base/bitstream_buffer.cc
index a4662663cce..e434157e7f0 100644
--- a/chromium/media/base/bitstream_buffer.cc
+++ b/chromium/media/base/bitstream_buffer.cc
@@ -9,26 +9,45 @@
namespace media {
BitstreamBuffer::BitstreamBuffer()
- : BitstreamBuffer(-1, base::SharedMemoryHandle(), 0) {}
+ : BitstreamBuffer(-1, base::subtle::PlatformSharedMemoryRegion(), 0) {}
+
+BitstreamBuffer::BitstreamBuffer(
+ int32_t id,
+ base::subtle::PlatformSharedMemoryRegion region,
+ size_t size,
+ off_t offset,
+ base::TimeDelta presentation_timestamp)
+ : id_(id),
+ region_(std::move(region)),
+ size_(size),
+ offset_(offset),
+ presentation_timestamp_(presentation_timestamp) {}
BitstreamBuffer::BitstreamBuffer(int32_t id,
base::SharedMemoryHandle handle,
+ bool read_only,
size_t size,
off_t offset,
base::TimeDelta presentation_timestamp)
: id_(id),
- handle_(handle),
+ region_(
+ base::subtle::PlatformSharedMemoryRegion::TakeFromSharedMemoryHandle(
+ handle.Duplicate(),
+ read_only
+ ? base::subtle::PlatformSharedMemoryRegion::Mode::kReadOnly
+ : base::subtle::PlatformSharedMemoryRegion::Mode::kUnsafe)),
size_(size),
offset_(offset),
presentation_timestamp_(presentation_timestamp) {}
-BitstreamBuffer::BitstreamBuffer(const BitstreamBuffer& other) = default;
+BitstreamBuffer::BitstreamBuffer(BitstreamBuffer&&) = default;
+BitstreamBuffer& BitstreamBuffer::operator=(BitstreamBuffer&&) = default;
BitstreamBuffer::~BitstreamBuffer() = default;
-scoped_refptr<DecoderBuffer> BitstreamBuffer::ToDecoderBuffer() const {
+scoped_refptr<DecoderBuffer> BitstreamBuffer::ToDecoderBuffer() {
scoped_refptr<DecoderBuffer> buffer =
- DecoderBuffer::FromSharedMemoryHandle(handle_, offset_, size_);
+ DecoderBuffer::FromSharedMemoryRegion(std::move(region_), offset_, size_);
if (!buffer)
return nullptr;
buffer->set_timestamp(presentation_timestamp_);