Chromium Code Reviews| Index: media/filters/decoder_stream_traits.cc |
| diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc |
| index 1744e729a4ebe5c4659e4897508248826c5d4f60..c86862f7fa4e4dd1ebf6f9fd9d68da5142e4debd 100644 |
| --- a/media/filters/decoder_stream_traits.cc |
| +++ b/media/filters/decoder_stream_traits.cc |
| @@ -5,10 +5,12 @@ |
| #include "media/filters/decoder_stream_traits.h" |
| #include "base/logging.h" |
| +#include "media/base/audio_buffer.h" |
| #include "media/base/audio_decoder.h" |
| #include "media/base/audio_decoder_config.h" |
| #include "media/base/video_decoder.h" |
| #include "media/base/video_decoder_config.h" |
| +#include "media/base/video_frame.h" |
| namespace media { |
| @@ -52,6 +54,11 @@ DecoderStreamTraits<DemuxerStream::AUDIO>::DecoderConfigType |
| return stream.audio_decoder_config(); |
| } |
| +scoped_refptr<DecoderStreamTraits<DemuxerStream::AUDIO>::OutputType> |
| + DecoderStreamTraits<DemuxerStream::AUDIO>::CreateEOSOutput() { |
| + return OutputType::CreateEOSBuffer(); |
| +} |
| + |
| std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() { |
| return "Video"; |
| } |
| @@ -94,4 +101,9 @@ DecoderStreamTraits<DemuxerStream::VIDEO>::DecoderConfigType |
| return stream.video_decoder_config(); |
| } |
| +scoped_refptr<DecoderStreamTraits<DemuxerStream::VIDEO>::OutputType> |
| + DecoderStreamTraits<DemuxerStream::VIDEO>::CreateEOSOutput() { |
| + return OutputType::CreateEOSFrame(); |
|
Sergey Ulanov
2014/06/16 23:49:32
Do you really need CreateEOSOutput() in DecoderStr
xhwang
2014/06/17 18:56:35
For audio, it's called CreateEOSBuffer(). CreateEO
|
| +} |
| + |
| } // namespace media |