Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.cc

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.h" 5 #include "chromecast/media/cma/ipc_streamer/decoder_buffer_base_marshaller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "chromecast/media/cma/base/cast_decrypt_config_impl.h" 13 #include "chromecast/media/cma/base/cast_decrypt_config_impl.h"
14 #include "chromecast/media/cma/base/decoder_buffer_base.h" 14 #include "chromecast/media/cma/base/decoder_buffer_base.h"
15 #include "chromecast/media/cma/ipc/media_message.h" 15 #include "chromecast/media/cma/ipc/media_message.h"
16 #include "chromecast/media/cma/ipc/media_message_type.h" 16 #include "chromecast/media/cma/ipc/media_message_type.h"
17 #include "chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h" 17 #include "chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h"
18 #include "chromecast/public/media/cast_decrypt_config.h" 18 #include "chromecast/public/media/cast_decrypt_config.h"
19 #include "media/base/decoder_buffer.h" 19 #include "media/base/decoder_buffer.h"
20 #include "media/base/decrypt_config.h" 20 #include "media/base/decrypt_config.h"
21 21
22 namespace chromecast { 22 namespace chromecast {
23 namespace media { 23 namespace media {
24 24
25 namespace { 25 namespace {
26 const size_t kMaxFrameSize = 4 * 1024 * 1024; 26 const size_t kMaxFrameSize = 4 * 1024 * 1024;
27 27
28 class DecoderBufferFromMsg : public DecoderBufferBase { 28 class DecoderBufferFromMsg : public DecoderBufferBase {
29 public: 29 public:
30 explicit DecoderBufferFromMsg(scoped_ptr<MediaMessage> msg); 30 explicit DecoderBufferFromMsg(std::unique_ptr<MediaMessage> msg);
31 31
32 void Initialize(); 32 void Initialize();
33 33
34 // DecoderBufferBase implementation. 34 // DecoderBufferBase implementation.
35 StreamId stream_id() const override; 35 StreamId stream_id() const override;
36 int64_t timestamp() const override; 36 int64_t timestamp() const override;
37 void set_timestamp(base::TimeDelta timestamp) override; 37 void set_timestamp(base::TimeDelta timestamp) override;
38 const uint8_t* data() const override; 38 const uint8_t* data() const override;
39 uint8_t* writable_data() const override; 39 uint8_t* writable_data() const override;
40 size_t data_size() const override; 40 size_t data_size() const override;
41 const CastDecryptConfig* decrypt_config() const override; 41 const CastDecryptConfig* decrypt_config() const override;
42 bool end_of_stream() const override; 42 bool end_of_stream() const override;
43 scoped_refptr<::media::DecoderBuffer> ToMediaBuffer() const override; 43 scoped_refptr<::media::DecoderBuffer> ToMediaBuffer() const override;
44 44
45 private: 45 private:
46 ~DecoderBufferFromMsg() override; 46 ~DecoderBufferFromMsg() override;
47 47
48 // Indicates whether this is an end of stream frame. 48 // Indicates whether this is an end of stream frame.
49 bool is_eos_; 49 bool is_eos_;
50 50
51 // Stream Id this decoder buffer belongs to. 51 // Stream Id this decoder buffer belongs to.
52 StreamId stream_id_; 52 StreamId stream_id_;
53 53
54 // Frame timestamp. 54 // Frame timestamp.
55 base::TimeDelta pts_; 55 base::TimeDelta pts_;
56 56
57 // CENC parameters. 57 // CENC parameters.
58 scoped_ptr<CastDecryptConfig> decrypt_config_; 58 std::unique_ptr<CastDecryptConfig> decrypt_config_;
59 59
60 // Size of the frame. 60 // Size of the frame.
61 size_t data_size_; 61 size_t data_size_;
62 62
63 // Keeps the message since frame data is not copied. 63 // Keeps the message since frame data is not copied.
64 scoped_ptr<MediaMessage> msg_; 64 std::unique_ptr<MediaMessage> msg_;
65 uint8_t* data_; 65 uint8_t* data_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(DecoderBufferFromMsg); 67 DISALLOW_COPY_AND_ASSIGN(DecoderBufferFromMsg);
68 }; 68 };
69 69
70 DecoderBufferFromMsg::DecoderBufferFromMsg(scoped_ptr<MediaMessage> msg) 70 DecoderBufferFromMsg::DecoderBufferFromMsg(std::unique_ptr<MediaMessage> msg)
71 : is_eos_(true), stream_id_(kPrimary), msg_(std::move(msg)), data_(NULL) { 71 : is_eos_(true), stream_id_(kPrimary), msg_(std::move(msg)), data_(NULL) {
72 CHECK(msg_); 72 CHECK(msg_);
73 } 73 }
74 74
75 DecoderBufferFromMsg::~DecoderBufferFromMsg() { 75 DecoderBufferFromMsg::~DecoderBufferFromMsg() {
76 } 76 }
77 77
78 void DecoderBufferFromMsg::Initialize() { 78 void DecoderBufferFromMsg::Initialize() {
79 CHECK_EQ(msg_->type(), FrameMediaMsg); 79 CHECK_EQ(msg_->type(), FrameMediaMsg);
80 80
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 DecryptConfigMarshaller::Write(*buffer->decrypt_config(), msg); 191 DecryptConfigMarshaller::Write(*buffer->decrypt_config(), msg);
192 } 192 }
193 } 193 }
194 194
195 CHECK(msg->WritePod(buffer->data_size())); 195 CHECK(msg->WritePod(buffer->data_size()));
196 CHECK(msg->WriteBuffer(buffer->data(), buffer->data_size())); 196 CHECK(msg->WriteBuffer(buffer->data(), buffer->data_size()));
197 } 197 }
198 198
199 // static 199 // static
200 scoped_refptr<DecoderBufferBase> DecoderBufferBaseMarshaller::Read( 200 scoped_refptr<DecoderBufferBase> DecoderBufferBaseMarshaller::Read(
201 scoped_ptr<MediaMessage> msg) { 201 std::unique_ptr<MediaMessage> msg) {
202 scoped_refptr<DecoderBufferFromMsg> buffer( 202 scoped_refptr<DecoderBufferFromMsg> buffer(
203 new DecoderBufferFromMsg(std::move(msg))); 203 new DecoderBufferFromMsg(std::move(msg)));
204 buffer->Initialize(); 204 buffer->Initialize();
205 return buffer; 205 return buffer;
206 } 206 }
207 207
208 } // namespace media 208 } // namespace media
209 } // namespace chromecast 209 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698