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

Unified Diff: media/filters/android/media_codec_audio_decoder.cc

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include 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 | « media/filters/android/media_codec_audio_decoder.h ('k') | media/filters/audio_clock_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/android/media_codec_audio_decoder.cc
diff --git a/media/filters/android/media_codec_audio_decoder.cc b/media/filters/android/media_codec_audio_decoder.cc
index c3bca6a7cee874e0e1bd32dbababa53a3c028736..6a3a8bb286b270fc0037304da7e0e917c7961b86 100644
--- a/media/filters/android/media_codec_audio_decoder.cc
+++ b/media/filters/android/media_codec_audio_decoder.cc
@@ -41,11 +41,12 @@ inline int GetChannelCount(const AudioDecoderConfig& config) {
return ChannelLayoutToChannelCount(config.channel_layout());
}
-scoped_ptr<MediaCodecBridge> CreateMediaCodec(const AudioDecoderConfig& config,
- jobject media_crypto) {
+std::unique_ptr<MediaCodecBridge> CreateMediaCodec(
+ const AudioDecoderConfig& config,
+ jobject media_crypto) {
DVLOG(1) << __FUNCTION__ << ": config:" << config.AsHumanReadableString();
- scoped_ptr<AudioCodecBridge> audio_codec_bridge(
+ std::unique_ptr<AudioCodecBridge> audio_codec_bridge(
AudioCodecBridge::Create(config.codec()));
if (!audio_codec_bridge) {
DVLOG(0) << __FUNCTION__ << " failed: cannot create AudioCodecBridge";
« no previous file with comments | « media/filters/android/media_codec_audio_decoder.h ('k') | media/filters/audio_clock_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698