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

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

Issue 2546263002: media: Continue aborting FFMpegDemuxerStream::Read() calls until Seek(). (Closed)
Patch Set: return 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
« no previous file with comments | « media/base/demuxer.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 Type type_; 178 Type type_;
179 Liveness liveness_; 179 Liveness liveness_;
180 base::TimeDelta duration_; 180 base::TimeDelta duration_;
181 bool end_of_stream_; 181 bool end_of_stream_;
182 base::TimeDelta last_packet_timestamp_; 182 base::TimeDelta last_packet_timestamp_;
183 base::TimeDelta last_packet_duration_; 183 base::TimeDelta last_packet_duration_;
184 Ranges<base::TimeDelta> buffered_ranges_; 184 Ranges<base::TimeDelta> buffered_ranges_;
185 VideoRotation video_rotation_; 185 VideoRotation video_rotation_;
186 bool is_enabled_; 186 bool is_enabled_;
187 bool waiting_for_keyframe_; 187 bool waiting_for_keyframe_;
188 bool aborted_;
188 189
189 DecoderBufferQueue buffer_queue_; 190 DecoderBufferQueue buffer_queue_;
190 ReadCB read_cb_; 191 ReadCB read_cb_;
191 StreamStatusChangeCB stream_status_change_cb_; 192 StreamStatusChangeCB stream_status_change_cb_;
192 193
193 #if defined(USE_PROPRIETARY_CODECS) 194 #if defined(USE_PROPRIETARY_CODECS)
194 std::unique_ptr<FFmpegBitstreamConverter> bitstream_converter_; 195 std::unique_ptr<FFmpegBitstreamConverter> bitstream_converter_;
195 #endif 196 #endif
196 197
197 std::string encryption_key_id_; 198 std::string encryption_key_id_;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
« no previous file with comments | « media/base/demuxer.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698