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

Side by Side Diff: media/base/android/access_unit_queue.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_ 5 #ifndef MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_
6 #define MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_ 6 #define MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <list> 10 #include <list>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
15 #include "media/base/android/demuxer_stream_player_params.h" 14 #include "media/base/android/demuxer_stream_player_params.h"
16 15
17 namespace media { 16 namespace media {
18 17
19 // The queue of incoming data for MediaCodecDecoder. 18 // The queue of incoming data for MediaCodecDecoder.
20 // 19 //
21 // The data comes in the form of access units. Each access unit has a type. 20 // The data comes in the form of access units. Each access unit has a type.
22 // If the type is |kConfigChanged| the access unit itself has no data, but 21 // If the type is |kConfigChanged| the access unit itself has no data, but
23 // is accompanied with DemuxerConfigs. 22 // is accompanied with DemuxerConfigs.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 103
105 // The lock protects all fields together. 104 // The lock protects all fields together.
106 mutable base::Lock lock_; 105 mutable base::Lock lock_;
107 106
108 DISALLOW_COPY_AND_ASSIGN(AccessUnitQueue); 107 DISALLOW_COPY_AND_ASSIGN(AccessUnitQueue);
109 }; 108 };
110 109
111 } // namespace media 110 } // namespace media
112 111
113 #endif // MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_ 112 #endif // MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_
OLDNEW
« no previous file with comments | « content/browser/media/session/media_session_delegate_android_browsertest.cc ('k') | media/base/android/android_cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698