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

Unified Diff: chromecast/media/cma/ipc_streamer/av_streamer_proxy.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 side-by-side diff with in-line comments
Download patch
Index: chromecast/media/cma/ipc_streamer/av_streamer_proxy.cc
diff --git a/chromecast/media/cma/ipc_streamer/av_streamer_proxy.cc b/chromecast/media/cma/ipc_streamer/av_streamer_proxy.cc
index 09fc5b5e99c389958a9dc075ee60963e546e64df..3743153c84754ab2b1b3dd9741d413154cd434cd 100644
--- a/chromecast/media/cma/ipc_streamer/av_streamer_proxy.cc
+++ b/chromecast/media/cma/ipc_streamer/av_streamer_proxy.cc
@@ -35,14 +35,14 @@ AvStreamerProxy::~AvStreamerProxy() {
}
void AvStreamerProxy::SetCodedFrameProvider(
- scoped_ptr<CodedFrameProvider> frame_provider) {
+ std::unique_ptr<CodedFrameProvider> frame_provider) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!frame_provider_);
frame_provider_.reset(frame_provider.release());
}
void AvStreamerProxy::SetMediaMessageFifo(
- scoped_ptr<MediaMessageFifo> fifo) {
+ std::unique_ptr<MediaMessageFifo> fifo) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!fifo_);
fifo_.reset(fifo.release());
@@ -158,17 +158,15 @@ void AvStreamerProxy::ProcessPendingData() {
bool AvStreamerProxy::SendAudioDecoderConfig(
const ::media::AudioDecoderConfig& config) {
// Create a dummy message to calculate first the message size.
- scoped_ptr<MediaMessage> dummy_msg(
+ std::unique_ptr<MediaMessage> dummy_msg(
MediaMessage::CreateDummyMessage(AudioConfigMediaMsg));
AudioDecoderConfigMarshaller::Write(config, dummy_msg.get());
// Create the real message and write the actual content.
- scoped_ptr<MediaMessage> msg(
- MediaMessage::CreateMessage(
- AudioConfigMediaMsg,
- base::Bind(&MediaMessageFifo::ReserveMemory,
- base::Unretained(fifo_.get())),
- dummy_msg->content_size()));
+ std::unique_ptr<MediaMessage> msg(MediaMessage::CreateMessage(
+ AudioConfigMediaMsg, base::Bind(&MediaMessageFifo::ReserveMemory,
+ base::Unretained(fifo_.get())),
+ dummy_msg->content_size()));
if (!msg)
return false;
@@ -179,17 +177,15 @@ bool AvStreamerProxy::SendAudioDecoderConfig(
bool AvStreamerProxy::SendVideoDecoderConfig(
const ::media::VideoDecoderConfig& config) {
// Create a dummy message to calculate first the message size.
- scoped_ptr<MediaMessage> dummy_msg(
+ std::unique_ptr<MediaMessage> dummy_msg(
MediaMessage::CreateDummyMessage(VideoConfigMediaMsg));
VideoDecoderConfigMarshaller::Write(config, dummy_msg.get());
// Create the real message and write the actual content.
- scoped_ptr<MediaMessage> msg(
- MediaMessage::CreateMessage(
- VideoConfigMediaMsg,
- base::Bind(&MediaMessageFifo::ReserveMemory,
- base::Unretained(fifo_.get())),
- dummy_msg->content_size()));
+ std::unique_ptr<MediaMessage> msg(MediaMessage::CreateMessage(
+ VideoConfigMediaMsg, base::Bind(&MediaMessageFifo::ReserveMemory,
+ base::Unretained(fifo_.get())),
+ dummy_msg->content_size()));
if (!msg)
return false;
@@ -200,17 +196,15 @@ bool AvStreamerProxy::SendVideoDecoderConfig(
bool AvStreamerProxy::SendBuffer(
const scoped_refptr<DecoderBufferBase>& buffer) {
// Create a dummy message to calculate first the message size.
- scoped_ptr<MediaMessage> dummy_msg(
+ std::unique_ptr<MediaMessage> dummy_msg(
MediaMessage::CreateDummyMessage(FrameMediaMsg));
DecoderBufferBaseMarshaller::Write(buffer, dummy_msg.get());
// Create the real message and write the actual content.
- scoped_ptr<MediaMessage> msg(
- MediaMessage::CreateMessage(
- FrameMediaMsg,
- base::Bind(&MediaMessageFifo::ReserveMemory,
- base::Unretained(fifo_.get())),
- dummy_msg->content_size()));
+ std::unique_ptr<MediaMessage> msg(MediaMessage::CreateMessage(
+ FrameMediaMsg, base::Bind(&MediaMessageFifo::ReserveMemory,
+ base::Unretained(fifo_.get())),
+ dummy_msg->content_size()));
if (!msg)
return false;
« no previous file with comments | « chromecast/media/cma/ipc_streamer/av_streamer_proxy.h ('k') | chromecast/media/cma/ipc_streamer/av_streamer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698