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

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 7867051: Introduce AudioDecoderConfig to migrate away from GetAVStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot files Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index e4e21af700b45f241f606cc8ac90dba58b4e4722..37f0e98832c272ea91602a3f124edf6484e036b8 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -67,6 +67,7 @@ FFmpegDemuxerStream::FFmpegDemuxerStream(FFmpegDemuxer* demuxer,
switch (stream->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
type_ = AUDIO;
+ audio_config_.reset(AVCodecContextToAudioDecoderConfig(stream->codec));
break;
case AVMEDIA_TYPE_VIDEO:
type_ = VIDEO;
@@ -241,6 +242,10 @@ AVStream* FFmpegDemuxerStream::GetAVStream() {
return stream_;
}
+AudioDecoderConfig* FFmpegDemuxerStream::audio_decoder_config() {
+ return audio_config_.get();
+}
+
// static
base::TimeDelta FFmpegDemuxerStream::ConvertStreamTimestamp(
const AVRational& time_base, int64 timestamp) {

Powered by Google App Engine
This is Rietveld 408576698