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

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

Issue 1922333002: Implement mapping blink track id to demuxer streams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback Created 4 years, 6 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
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 20 matching lines...) Expand all
31 #include <vector> 31 #include <vector>
32 32
33 #include "base/callback.h" 33 #include "base/callback.h"
34 #include "base/macros.h" 34 #include "base/macros.h"
35 #include "base/memory/scoped_vector.h" 35 #include "base/memory/scoped_vector.h"
36 #include "base/threading/thread.h" 36 #include "base/threading/thread.h"
37 #include "media/base/audio_decoder_config.h" 37 #include "media/base/audio_decoder_config.h"
38 #include "media/base/decoder_buffer.h" 38 #include "media/base/decoder_buffer.h"
39 #include "media/base/decoder_buffer_queue.h" 39 #include "media/base/decoder_buffer_queue.h"
40 #include "media/base/demuxer.h" 40 #include "media/base/demuxer.h"
41 #include "media/base/media_tracks.h"
41 #include "media/base/pipeline_status.h" 42 #include "media/base/pipeline_status.h"
42 #include "media/base/text_track_config.h" 43 #include "media/base/text_track_config.h"
43 #include "media/base/video_decoder_config.h" 44 #include "media/base/video_decoder_config.h"
44 #include "media/ffmpeg/ffmpeg_deleters.h" 45 #include "media/ffmpeg/ffmpeg_deleters.h"
45 #include "media/filters/blocking_url_protocol.h" 46 #include "media/filters/blocking_url_protocol.h"
46 47
47 // FFmpeg forward declarations. 48 // FFmpeg forward declarations.
48 struct AVPacket; 49 struct AVPacket;
49 struct AVRational; 50 struct AVRational;
50 struct AVStream; 51 struct AVStream;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // Allow FFmpegDemuxerStream to notify us when there is updated information 217 // Allow FFmpegDemuxerStream to notify us when there is updated information
217 // about capacity and what buffered data is available. 218 // about capacity and what buffered data is available.
218 void NotifyCapacityAvailable(); 219 void NotifyCapacityAvailable();
219 void NotifyBufferingChanged(); 220 void NotifyBufferingChanged();
220 221
221 // The lowest demuxed timestamp. If negative, DemuxerStreams must use this to 222 // The lowest demuxed timestamp. If negative, DemuxerStreams must use this to
222 // adjust packet timestamps such that external clients see a zero-based 223 // adjust packet timestamps such that external clients see a zero-based
223 // timeline. 224 // timeline.
224 base::TimeDelta start_time() const { return start_time_; } 225 base::TimeDelta start_time() const { return start_time_; }
225 226
227 // Notifies the demuxer that track ids has been assigned to a media tracks.
228 void OnTrackIdsAssigned(const MediaTracks& tracks,
229 const std::vector<unsigned>& track_ids) override;
230
231 // Finds a DemuxerStream corresponding to the given blink |track_id|. Note
232 // that the input track id is blink track id and not bytestream track id.
233 const DemuxerStream* GetDemuxerStreamByTrackId(
234 unsigned track_id) const override;
235
226 private: 236 private:
227 // To allow tests access to privates. 237 // To allow tests access to privates.
228 friend class FFmpegDemuxerTest; 238 friend class FFmpegDemuxerTest;
229 239
230 // FFmpeg callbacks during initialization. 240 // FFmpeg callbacks during initialization.
231 void OnOpenContextDone(const PipelineStatusCB& status_cb, bool result); 241 void OnOpenContextDone(const PipelineStatusCB& status_cb, bool result);
232 void OnFindStreamInfoDone(const PipelineStatusCB& status_cb, int result); 242 void OnFindStreamInfoDone(const PipelineStatusCB& status_cb, int result);
233 243
234 // FFmpeg callbacks during seeking. 244 // FFmpeg callbacks during seeking.
235 void OnSeekFrameDone(const PipelineStatusCB& cb, int result); 245 void OnSeekFrameDone(const PipelineStatusCB& cb, int result);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 bool duration_known_; 337 bool duration_known_;
328 338
329 // FFmpegURLProtocol implementation and corresponding glue bits. 339 // FFmpegURLProtocol implementation and corresponding glue bits.
330 std::unique_ptr<BlockingUrlProtocol> url_protocol_; 340 std::unique_ptr<BlockingUrlProtocol> url_protocol_;
331 std::unique_ptr<FFmpegGlue> glue_; 341 std::unique_ptr<FFmpegGlue> glue_;
332 342
333 const EncryptedMediaInitDataCB encrypted_media_init_data_cb_; 343 const EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
334 344
335 const MediaTracksUpdatedCB media_tracks_updated_cb_; 345 const MediaTracksUpdatedCB media_tracks_updated_cb_;
336 346
347 MediaTracks::TrackIdToDemuxStreamMap track_id_to_demux_stream_;
348
337 // NOTE: Weak pointers must be invalidated before all other member variables. 349 // NOTE: Weak pointers must be invalidated before all other member variables.
338 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_; 350 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
339 351
340 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer); 352 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
341 }; 353 };
342 354
343 } // namespace media 355 } // namespace media
344 356
345 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_ 357 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698