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

Unified Diff: media/base/stream_parser_buffer.cc

Issue 125543002: Add plumbing and support for crossfading StreamParserBuffers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 11 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/base/stream_parser_buffer.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/stream_parser_buffer.cc
diff --git a/media/base/stream_parser_buffer.cc b/media/base/stream_parser_buffer.cc
index bb46ef516eccd1dc3e25e1c1d09447a284a6cfc6..e5cc9795c0318ca7e3e485fb4c553fb9cae0fa58 100644
--- a/media/base/stream_parser_buffer.cc
+++ b/media/base/stream_parser_buffer.cc
@@ -9,6 +9,15 @@
namespace media {
+static bool HasNestedFadeOutPreroll(
+ const std::vector<scoped_refptr<StreamParserBuffer> >& fade_out_preroll) {
+ for (size_t i = 0; i < fade_out_preroll.size(); ++i) {
+ if (!fade_out_preroll[i]->GetFadeOutPreroll().empty())
+ return true;
+ }
+ return false;
+}
+
scoped_refptr<StreamParserBuffer> StreamParserBuffer::CreateEOSBuffer() {
return make_scoped_refptr(new StreamParserBuffer(NULL, 0, NULL, 0, false));
}
@@ -63,4 +72,15 @@ void StreamParserBuffer::SetConfigId(int config_id) {
config_id_ = config_id;
}
+const std::vector<scoped_refptr<StreamParserBuffer> >&
+StreamParserBuffer::GetFadeOutPreroll() const {
+ return fade_out_preroll_;
+}
+
+void StreamParserBuffer::SetFadeOutPreroll(
+ const std::vector<scoped_refptr<StreamParserBuffer> >& fade_out_preroll) {
+ DCHECK(!HasNestedFadeOutPreroll(fade_out_preroll));
+ fade_out_preroll_ = fade_out_preroll;
+}
+
} // namespace media
« no previous file with comments | « media/base/stream_parser_buffer.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698