chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h - Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h

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

« no previous file with comments | « chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.cc ('k') | chromecast/media/cma/pipeline/audio_pipeline_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h

diff --git a/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h b/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h

index abb77a639c73aee1e33a369aea3effb86683a303..738c18de3bdd371e7934ade9dfccac543f260c11 100644

--- a/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h

+++ b/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.h

@@ -7,9 +7,10 @@

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

#include "base/memory/ref_counted.h"

-#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "chromecast/media/cma/decoder/cast_audio_decoder.h"

#include "chromecast/public/media/media_pipeline_backend.h"

@@ -55,7 +56,7 @@ class AudioDecoderSoftwareWrapper

MediaPipelineBackend::AudioDecoder* const backend_decoder_;

DecoderDelegate* delegate_;

- scoped_ptr<CastAudioDecoder> software_decoder_;

+ std::unique_ptr<CastAudioDecoder> software_decoder_;

AudioConfig output_config_;

scoped_refptr<DecoderBufferBase> pending_pushed_buffer_;