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

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

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid
Patch Set: Rebase 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 337
337 // NOTE: Weak pointers must be invalidated before all other member variables. 338 // NOTE: Weak pointers must be invalidated before all other member variables.
338 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_; 339 base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
339 340
340 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer); 341 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
341 }; 342 };
342 343
343 } // namespace media 344 } // namespace media
344 345
345 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_ 346 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698