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

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

Issue 2440563004: Switch to using an explicit ended signal instead of time comparison. (Closed)
Patch Set: Fix ended event in ARI. Created 4 years, 1 month 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 (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 // Implements the Demuxer interface using FFmpeg's libavformat. At this time 5 // Implements the Demuxer interface using FFmpeg's libavformat. At this time
6 // will support demuxing any audio/video format thrown at it. The streams 6 // will support demuxing any audio/video format thrown at it. The streams
7 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer 7 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
8 // key FFmpegCodecID which contains the CodecID enumeration value. The CodecIDs 8 // key FFmpegCodecID which contains the CodecID enumeration value. The CodecIDs
9 // can be used to create and initialize the corresponding FFmpeg decoder. 9 // can be used to create and initialize the corresponding FFmpeg decoder.
10 // 10 //
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 // The Time associated with timestamp 0. Set to a null 337 // The Time associated with timestamp 0. Set to a null
338 // time if the file doesn't have an association to Time. 338 // time if the file doesn't have an association to Time.
339 base::Time timeline_offset_; 339 base::Time timeline_offset_;
340 340
341 // Whether text streams have been enabled for this demuxer. 341 // Whether text streams have been enabled for this demuxer.
342 bool text_enabled_; 342 bool text_enabled_;
343 343
344 // Set if we know duration of the audio stream. Used when processing end of 344 // Set if we know duration of the audio stream. Used when processing end of
345 // stream -- at this moment we definitely know duration. 345 // stream -- at this moment we definitely know duration.
346 bool duration_known_; 346 bool duration_known_;
347 base::TimeDelta duration_;
347 348
348 // FFmpegURLProtocol implementation and corresponding glue bits. 349 // FFmpegURLProtocol implementation and corresponding glue bits.
349 std::unique_ptr<BlockingUrlProtocol> url_protocol_; 350 std::unique_ptr<BlockingUrlProtocol> url_protocol_;
350 std::unique_ptr<FFmpegGlue> glue_; 351 std::unique_ptr<FFmpegGlue> glue_;
351 352
352 const EncryptedMediaInitDataCB encrypted_media_init_data_cb_; 353 const EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
353 354
354 const MediaTracksUpdatedCB media_tracks_updated_cb_; 355 const MediaTracksUpdatedCB media_tracks_updated_cb_;
355 356
356 std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_; 357 std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
357 358
358 // NOTE: Weak pointers must be invalidated before all other member variables. 359 // NOTE: Weak pointers must be invalidated before all other member variables.
359 base::WeakPtr<FFmpegDemuxer> weak_this_; 360 base::WeakPtr<FFmpegDemuxer> weak_this_;
360 base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_; 361 base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_;
361 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_; 362 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
362 363
363 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer); 364 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
364 }; 365 };
365 366
366 } // namespace media 367 } // namespace media
367 368
368 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_ 369 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698