diff options
| author | Bo Liu <boliu@google.com> | 2014-05-01 10:37:37 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-05-01 10:37:37 -0700 |
| commit | 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 (patch) | |
| tree | 5df224c921d52ab02739b38e2149652208b023e6 /media/filters/decoder_stream_traits.cc | |
| parent | 56e9d6e218656f3d05620cc9877fd61482337fb1 (diff) | |
| download | chromium_org-5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1.tar.gz | |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
Diffstat (limited to 'media/filters/decoder_stream_traits.cc')
| -rw-r--r-- | media/filters/decoder_stream_traits.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc index 4eb2e48a28..ce79ddd4b4 100644 --- a/media/filters/decoder_stream_traits.cc +++ b/media/filters/decoder_stream_traits.cc @@ -16,6 +16,14 @@ std::string DecoderStreamTraits<DemuxerStream::AUDIO>::ToString() { return "Audio"; } +void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize( + DecoderType* decoder, + const DecoderConfigType& config, + bool low_delay, + const PipelineStatusCB& status_cb) { + decoder->Initialize(config, status_cb); +} + bool DecoderStreamTraits<DemuxerStream::AUDIO>::FinishInitialization( const StreamInitCB& init_cb, DecoderType* decoder, @@ -47,6 +55,14 @@ std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() { return "Video"; } +void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize( + DecoderType* decoder, + const DecoderConfigType& config, + bool low_delay, + const PipelineStatusCB& status_cb) { + decoder->Initialize(config, low_delay, status_cb); +} + bool DecoderStreamTraits<DemuxerStream::VIDEO>::FinishInitialization( const StreamInitCB& init_cb, DecoderType* decoder, |