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

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

Issue 2563183002: Fix up missing timestamps in FFmpegDemuxer. (Closed)
Patch Set: Created 4 years 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 DecoderBufferQueue buffer_queue_; 190 DecoderBufferQueue buffer_queue_;
191 ReadCB read_cb_; 191 ReadCB read_cb_;
192 StreamStatusChangeCB stream_status_change_cb_; 192 StreamStatusChangeCB stream_status_change_cb_;
193 193
194 #if defined(USE_PROPRIETARY_CODECS) 194 #if defined(USE_PROPRIETARY_CODECS)
195 std::unique_ptr<FFmpegBitstreamConverter> bitstream_converter_; 195 std::unique_ptr<FFmpegBitstreamConverter> bitstream_converter_;
196 #endif 196 #endif
197 197
198 std::string encryption_key_id_; 198 std::string encryption_key_id_;
199 bool fixup_negative_timestamps_; 199 bool fixup_negative_timestamps_;
200 bool warned_about_missing_timestamps_;
200 201
201 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream); 202 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
202 }; 203 };
203 204
204 class MEDIA_EXPORT FFmpegDemuxer : public Demuxer { 205 class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
205 public: 206 public:
206 FFmpegDemuxer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 207 FFmpegDemuxer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
207 DataSource* data_source, 208 DataSource* data_source,
208 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, 209 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
209 const MediaTracksUpdatedCB& media_tracks_updated_cb, 210 const MediaTracksUpdatedCB& media_tracks_updated_cb,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 base::WeakPtr<FFmpegDemuxer> weak_this_; 366 base::WeakPtr<FFmpegDemuxer> weak_this_;
366 base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_; 367 base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_;
367 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_; 368 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
368 369
369 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer); 370 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
370 }; 371 };
371 372
372 } // namespace media 373 } // namespace media
373 374
374 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_ 375 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698