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

Side by Side Diff: chromecast/media/cma/base/decoder_buffer_adapter.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 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 #ifndef CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_ADAPTER_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_ADAPTER_H_
6 #define CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_ADAPTER_H_ 6 #define CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_ADAPTER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory>
12
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "chromecast/media/cma/base/decoder_buffer_base.h" 15 #include "chromecast/media/cma/base/decoder_buffer_base.h"
15 16
16 namespace media { 17 namespace media {
17 class DecoderBuffer; 18 class DecoderBuffer;
18 } 19 }
19 20
20 namespace chromecast { 21 namespace chromecast {
21 namespace media { 22 namespace media {
22 23
23 // DecoderBufferAdapter wraps a ::media::DecoderBuffer 24 // DecoderBufferAdapter wraps a ::media::DecoderBuffer
(...skipping 17 matching lines...) Expand all
41 const CastDecryptConfig* decrypt_config() const override; 42 const CastDecryptConfig* decrypt_config() const override;
42 bool end_of_stream() const override; 43 bool end_of_stream() const override;
43 44
44 scoped_refptr<::media::DecoderBuffer> ToMediaBuffer() const override; 45 scoped_refptr<::media::DecoderBuffer> ToMediaBuffer() const override;
45 46
46 private: 47 private:
47 ~DecoderBufferAdapter() override; 48 ~DecoderBufferAdapter() override;
48 49
49 StreamId stream_id_; 50 StreamId stream_id_;
50 scoped_refptr<::media::DecoderBuffer> const buffer_; 51 scoped_refptr<::media::DecoderBuffer> const buffer_;
51 mutable scoped_ptr<CastDecryptConfig> decrypt_config_; 52 mutable std::unique_ptr<CastDecryptConfig> decrypt_config_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(DecoderBufferAdapter); 54 DISALLOW_COPY_AND_ASSIGN(DecoderBufferAdapter);
54 }; 55 };
55 56
56 } // namespace media 57 } // namespace media
57 } // namespace chromecast 58 } // namespace chromecast
58 59
59 #endif // CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_ADAPTER_H_ 60 #endif // CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_ADAPTER_H_
OLDNEW
« no previous file with comments | « chromecast/media/cma/base/buffering_frame_provider_unittest.cc ('k') | chromecast/media/cma/base/decoder_buffer_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698