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

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

Issue 1839763005: MSE: Protect better against reaching HAVE_METADATA too early (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased onto https://codereview.chromium.org/1826583003/. Ready for final review. 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 | « no previous file | 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 scoped_ptr<ChunkDemuxerStream> audio_;
382 scoped_ptr<ChunkDemuxerStream> video_; 382 scoped_ptr<ChunkDemuxerStream> video_;
383 383
384 // Counter to ensure that we do not transition too early to INITIALIZED.
385 // Incremented in AddId(), decremented in OnSourceInitDone().
386 int pending_source_init_done_count_;
387
384 base::TimeDelta duration_; 388 base::TimeDelta duration_;
385 389
386 // The duration passed to the last SetDuration(). If 390 // The duration passed to the last SetDuration(). If
387 // SetDuration() is never called or an AppendData() call or 391 // SetDuration() is never called or an AppendData() call or
388 // a EndOfStream() call changes |duration_|, then this 392 // a EndOfStream() call changes |duration_|, then this
389 // variable is set to < 0 to indicate that the |duration_| represents 393 // variable is set to < 0 to indicate that the |duration_| represents
390 // the actual duration instead of a user specified value. 394 // the actual duration instead of a user specified value.
391 double user_specified_duration_; 395 double user_specified_duration_;
392 396
393 base::Time timeline_offset_; 397 base::Time timeline_offset_;
(...skipping 15 matching lines...) Expand all
409 int detected_audio_track_count_; 413 int detected_audio_track_count_;
410 int detected_video_track_count_; 414 int detected_video_track_count_;
411 int detected_text_track_count_; 415 int detected_text_track_count_;
412 416
413 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 417 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
414 }; 418 };
415 419
416 } // namespace media 420 } // namespace media
417 421
418 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 422 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698