summaryrefslogtreecommitdiffstats
path: root/media/base/demuxer_stream.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 22:44:04 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 22:44:04 +0000
commit1ab1c24bda1b30b57e040b3b077a001d095fcab3 (patch)
tree59e01bd62cc44596a5d8df6c7e63e6414846b4a8 /media/base/demuxer_stream.h
parent735586ec444f701f94219fbb59ff01f11b064071 (diff)
downloadchromium_src-1ab1c24bda1b30b57e040b3b077a001d095fcab3.zip
chromium_src-1ab1c24bda1b30b57e040b3b077a001d095fcab3.tar.gz
chromium_src-1ab1c24bda1b30b57e040b3b077a001d095fcab3.tar.bz2
Introduce AudioDecoderConfig to migrate away from GetAVStream().
Instead add DemuxerStream::audio_decoder_config() to break FFmpegAudioDecoder's dependency on the AVCodecContext object maintained by FFmpegDemuxer. Review URL: http://codereview.chromium.org/7867051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/demuxer_stream.h')
-rw-r--r--media/base/demuxer_stream.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h
index 5256115..e81423e 100644
--- a/media/base/demuxer_stream.h
+++ b/media/base/demuxer_stream.h
@@ -13,6 +13,7 @@ struct AVStream;
namespace media {
+class AudioDecoderConfig;
class Buffer;
class MEDIA_EXPORT DemuxerStream
@@ -34,6 +35,10 @@ class MEDIA_EXPORT DemuxerStream
// Returns an |AVStream*| if supported, or NULL.
virtual AVStream* GetAVStream();
+ // Returns the audio decoder configuration. It is an error to call this method
+ // if type() != AUDIO.
+ virtual const AudioDecoderConfig& audio_decoder_config() = 0;
+
// Returns the type of stream.
virtual Type type() = 0;