| Index: content/renderer/media/gpu/rtc_video_decoder.h
|
| diff --git a/content/renderer/media/gpu/rtc_video_decoder.h b/content/renderer/media/gpu/rtc_video_decoder.h
|
| index d77220f5e4b6aa6d05bb681c86e757f6090faa2d..e6eefade04b4073981784e09c6078d0d5ec2bae2 100644
|
| --- a/content/renderer/media/gpu/rtc_video_decoder.h
|
| +++ b/content/renderer/media/gpu/rtc_video_decoder.h
|
| @@ -11,6 +11,7 @@
|
| #include <deque>
|
| #include <list>
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <utility>
|
|
|
| @@ -238,8 +239,9 @@ class CONTENT_EXPORT RTCVideoDecoder
|
| std::list<BufferData> input_buffer_data_;
|
|
|
| // A map from bitstream buffer IDs to bitstream buffers that are being
|
| - // processed by VDA. The map owns SHM buffers.
|
| - std::map<int32_t, base::SharedMemory*> bitstream_buffers_in_decoder_;
|
| + // processed by VDA.
|
| + std::map<int32_t, std::unique_ptr<base::SharedMemory>>
|
| + bitstream_buffers_in_decoder_;
|
|
|
| // A map from picture buffer IDs to texture-backed picture buffers.
|
| std::map<int32_t, media::PictureBuffer> assigned_picture_buffers_;
|
| @@ -271,17 +273,17 @@ class CONTENT_EXPORT RTCVideoDecoder
|
|
|
| // Shared-memory buffer pool. Since allocating SHM segments requires a
|
| // round-trip to the browser process, we keep allocation out of the
|
| - // steady-state of the decoder. The vector owns SHM buffers. Guarded by
|
| - // |lock_|.
|
| - std::vector<base::SharedMemory*> available_shm_segments_;
|
| + // steady-state of the decoder. Guarded by |lock_|.
|
| + std::vector<std::unique_ptr<base::SharedMemory>> available_shm_segments_;
|
|
|
| // A queue storing WebRTC encoding images (and their metadata) that are
|
| // waiting for the shared memory. Guarded by |lock_|.
|
| std::deque<std::pair<webrtc::EncodedImage, BufferData>> pending_buffers_;
|
|
|
| // A queue storing buffers (and their metadata) that will be sent to VDA for
|
| - // decode. The queue owns SHM buffers. Guarded by |lock_|.
|
| - std::deque<std::pair<base::SharedMemory*, BufferData>> decode_buffers_;
|
| + // decode. Guarded by |lock_|.
|
| + std::deque<std::pair<std::unique_ptr<base::SharedMemory>, BufferData>>
|
| + decode_buffers_;
|
|
|
| // The id that will be given to the next bitstream buffer. Guarded by |lock_|.
|
| int32_t next_bitstream_buffer_id_;
|
|
|