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

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

Issue 2645953004: Update duration when demuxed packets exceed known duration. (Closed)
Patch Set: Remux and encode test.ogv. Fixes bad duration. Created 3 years, 11 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/ffmpeg_demuxer.cc » ('j') | media/filters/ffmpeg_demuxer.cc » ('J')
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 // 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 // The Time associated with timestamp 0. Set to a null 346 // The Time associated with timestamp 0. Set to a null
347 // time if the file doesn't have an association to Time. 347 // time if the file doesn't have an association to Time.
348 base::Time timeline_offset_; 348 base::Time timeline_offset_;
349 349
350 // Whether text streams have been enabled for this demuxer. 350 // Whether text streams have been enabled for this demuxer.
351 bool text_enabled_; 351 bool text_enabled_;
352 352
353 // Set if we know duration of the audio stream. Used when processing end of 353 // Set if we know duration of the audio stream. Used when processing end of
354 // stream -- at this moment we definitely know duration. 354 // stream -- at this moment we definitely know duration.
355 bool duration_known_; 355 bool duration_known_;
356 base::TimeDelta duration_;
356 357
357 // FFmpegURLProtocol implementation and corresponding glue bits. 358 // FFmpegURLProtocol implementation and corresponding glue bits.
358 std::unique_ptr<BlockingUrlProtocol> url_protocol_; 359 std::unique_ptr<BlockingUrlProtocol> url_protocol_;
359 std::unique_ptr<FFmpegGlue> glue_; 360 std::unique_ptr<FFmpegGlue> glue_;
360 361
361 const EncryptedMediaInitDataCB encrypted_media_init_data_cb_; 362 const EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
362 363
363 const MediaTracksUpdatedCB media_tracks_updated_cb_; 364 const MediaTracksUpdatedCB media_tracks_updated_cb_;
364 365
365 std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_; 366 std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
366 367
367 // NOTE: Weak pointers must be invalidated before all other member variables. 368 // NOTE: Weak pointers must be invalidated before all other member variables.
368 base::WeakPtr<FFmpegDemuxer> weak_this_; 369 base::WeakPtr<FFmpegDemuxer> weak_this_;
369 base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_; 370 base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_;
370 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_; 371 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
371 372
372 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer); 373 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
373 }; 374 };
374 375
375 } // namespace media 376 } // namespace media
376 377
377 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_ 378 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/ffmpeg_demuxer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698