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

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

Issue 10825108: Remove a bunch of dead fields found by Scythe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
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 #include "media/filters/ffmpeg_demuxer.h" 5 #include "media/filters/ffmpeg_demuxer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 17 matching lines...) Expand all
28 28
29 // 29 //
30 // FFmpegDemuxerStream 30 // FFmpegDemuxerStream
31 // 31 //
32 FFmpegDemuxerStream::FFmpegDemuxerStream( 32 FFmpegDemuxerStream::FFmpegDemuxerStream(
33 FFmpegDemuxer* demuxer, 33 FFmpegDemuxer* demuxer,
34 AVStream* stream) 34 AVStream* stream)
35 : demuxer_(demuxer), 35 : demuxer_(demuxer),
36 stream_(stream), 36 stream_(stream),
37 type_(UNKNOWN), 37 type_(UNKNOWN),
38 discontinuous_(false),
39 stopped_(false), 38 stopped_(false),
40 last_packet_timestamp_(kNoTimestamp()) { 39 last_packet_timestamp_(kNoTimestamp()) {
41 DCHECK(demuxer_); 40 DCHECK(demuxer_);
42 41
43 // Determine our media format. 42 // Determine our media format.
44 switch (stream->codec->codec_type) { 43 switch (stream->codec->codec_type) {
45 case AVMEDIA_TYPE_AUDIO: 44 case AVMEDIA_TYPE_AUDIO:
46 type_ = AUDIO; 45 type_ = AUDIO;
47 AVCodecContextToAudioDecoderConfig(stream->codec, &audio_config_); 46 AVCodecContextToAudioDecoderConfig(stream->codec, &audio_config_);
48 break; 47 break;
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 } else if (audio) { 726 } else if (audio) {
728 buffered = audio->GetBufferedRanges(); 727 buffered = audio->GetBufferedRanges();
729 } else if (video) { 728 } else if (video) {
730 buffered = video->GetBufferedRanges(); 729 buffered = video->GetBufferedRanges();
731 } 730 }
732 for (size_t i = 0; i < buffered.size(); ++i) 731 for (size_t i = 0; i < buffered.size(); ++i)
733 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); 732 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
734 } 733 }
735 734
736 } // namespace media 735 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698