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

Side by Side Diff: media/filters/chunk_demuxer.h

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 unified diff | Download patch
« no previous file with comments | « media/filters/audio_renderer_algorithm_unittest.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_FILTERS_CHUNK_DEMUXER_H_ 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // Assigns |state_| to |state| 129 // Assigns |state_| to |state|
130 void ChangeState_Locked(State state); 130 void ChangeState_Locked(State state);
131 131
132 void CompletePendingReadIfPossible_Locked(); 132 void CompletePendingReadIfPossible_Locked();
133 133
134 // Specifies the type of the stream. 134 // Specifies the type of the stream.
135 Type type_; 135 Type type_;
136 136
137 Liveness liveness_; 137 Liveness liveness_;
138 138
139 scoped_ptr<SourceBufferStream> stream_; 139 std::unique_ptr<SourceBufferStream> stream_;
140 140
141 mutable base::Lock lock_; 141 mutable base::Lock lock_;
142 State state_; 142 State state_;
143 ReadCB read_cb_; 143 ReadCB read_cb_;
144 bool splice_frames_enabled_; 144 bool splice_frames_enabled_;
145 bool partial_append_window_trimming_enabled_; 145 bool partial_append_window_trimming_enabled_;
146 146
147 DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream); 147 DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
148 }; 148 };
149 149
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 // MediaLog for reporting messages and properties to debug content and engine. 371 // MediaLog for reporting messages and properties to debug content and engine.
372 scoped_refptr<MediaLog> media_log_; 372 scoped_refptr<MediaLog> media_log_;
373 373
374 PipelineStatusCB init_cb_; 374 PipelineStatusCB init_cb_;
375 // Callback to execute upon seek completion. 375 // Callback to execute upon seek completion.
376 // TODO(wolenetz/acolwell): Protect against possible double-locking by first 376 // TODO(wolenetz/acolwell): Protect against possible double-locking by first
377 // releasing |lock_| before executing this callback. See 377 // releasing |lock_| before executing this callback. See
378 // http://crbug.com/308226 378 // http://crbug.com/308226
379 PipelineStatusCB seek_cb_; 379 PipelineStatusCB seek_cb_;
380 380
381 scoped_ptr<ChunkDemuxerStream> audio_; 381 std::unique_ptr<ChunkDemuxerStream> audio_;
382 scoped_ptr<ChunkDemuxerStream> video_; 382 std::unique_ptr<ChunkDemuxerStream> video_;
383 383
384 // Counter to ensure that we do not transition too early to INITIALIZED. 384 // Counter to ensure that we do not transition too early to INITIALIZED.
385 // Incremented in AddId(), decremented in OnSourceInitDone(). 385 // Incremented in AddId(), decremented in OnSourceInitDone().
386 int pending_source_init_done_count_; 386 int pending_source_init_done_count_;
387 387
388 base::TimeDelta duration_; 388 base::TimeDelta duration_;
389 389
390 // The duration passed to the last SetDuration(). If 390 // The duration passed to the last SetDuration(). If
391 // SetDuration() is never called or an AppendData() call or 391 // SetDuration() is never called or an AppendData() call or
392 // a EndOfStream() call changes |duration_|, then this 392 // a EndOfStream() call changes |duration_|, then this
(...skipping 20 matching lines...) Expand all
413 int detected_audio_track_count_; 413 int detected_audio_track_count_;
414 int detected_video_track_count_; 414 int detected_video_track_count_;
415 int detected_text_track_count_; 415 int detected_text_track_count_;
416 416
417 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 417 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
418 }; 418 };
419 419
420 } // namespace media 420 } // namespace media
421 421
422 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 422 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/filters/audio_renderer_algorithm_unittest.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698