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

Unified Diff: media/blink/webmediasource_impl.cc

Issue 1281663003: Media: Introduce addSourceBuffer which takes an unparsed codecs string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: buildfix Created 5 years, 4 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/blink/webmediasource_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediasource_impl.cc
diff --git a/media/blink/webmediasource_impl.cc b/media/blink/webmediasource_impl.cc
index 4760a49c042c8b8cbd4d13cd4842b507f7963027..90af0a184ddb2af00ea3b6db224595e900b6c9d8 100644
--- a/media/blink/webmediasource_impl.cc
+++ b/media/blink/webmediasource_impl.cc
@@ -5,6 +5,7 @@
#include "media/blink/webmediasource_impl.h"
#include "base/guid.h"
+#include "media/base/mime_util.h"
#include "media/blink/websourcebuffer_impl.h"
#include "media/filters/chunk_demuxer.h"
#include "third_party/WebKit/public/platform/WebCString.h"
@@ -51,6 +52,25 @@ WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
return result;
}
+WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
+ const blink::WebString& type,
+ const blink::WebString& codecs,
+ blink::WebSourceBuffer** source_buffer) {
+ std::string id = base::GenerateGUID();
+
+ std::vector<std::string> parsed_codec_ids;
+ media::ParseCodecString(codecs.utf8().data(), &parsed_codec_ids, false);
+
+ WebMediaSource::AddStatus result =
+ static_cast<WebMediaSource::AddStatus>(
+ demuxer_->AddId(id, type.utf8().data(), parsed_codec_ids));
+
+ if (result == WebMediaSource::AddStatusOk)
+ *source_buffer = new WebSourceBufferImpl(id, demuxer_);
+
+ return result;
+}
+
double WebMediaSourceImpl::duration() {
return demuxer_->GetDuration();
}
« no previous file with comments | « media/blink/webmediasource_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698