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

Unified Diff: media/filters/decoder_stream_traits.cc

Issue 339653003: No EOS frame in {Audio|Video}Decoder::OutputCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 6 years, 6 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
« no previous file with comments | « media/filters/decoder_stream_traits.h ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
+}
+
} // namespace media
« no previous file with comments | « media/filters/decoder_stream_traits.h ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698