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

Side by Side Diff: content/renderer/media/webmediasource_impl.cc

Issue 220113002: MSE: Pick frame processor in ChunkDemuxer::AddId; prepare unit tests to pick processor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webmediasource_impl.h" 5 #include "content/renderer/media/webmediasource_impl.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "content/renderer/media/websourcebuffer_impl.h" 8 #include "content/renderer/media/websourcebuffer_impl.h"
9 #include "media/filters/chunk_demuxer.h" 9 #include "media/filters/chunk_demuxer.h"
10 #include "third_party/WebKit/public/platform/WebCString.h" 10 #include "third_party/WebKit/public/platform/WebCString.h"
(...skipping 18 matching lines...) Expand all
29 : demuxer_(demuxer), 29 : demuxer_(demuxer),
30 log_cb_(log_cb) { 30 log_cb_(log_cb) {
31 DCHECK(demuxer_); 31 DCHECK(demuxer_);
32 } 32 }
33 33
34 WebMediaSourceImpl::~WebMediaSourceImpl() {} 34 WebMediaSourceImpl::~WebMediaSourceImpl() {}
35 35
36 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer( 36 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
37 const blink::WebString& type, 37 const blink::WebString& type,
38 const blink::WebVector<blink::WebString>& codecs, 38 const blink::WebVector<blink::WebString>& codecs,
39 const bool use_legacy_frame_processor,
39 blink::WebSourceBuffer** source_buffer) { 40 blink::WebSourceBuffer** source_buffer) {
40 std::string id = base::GenerateGUID(); 41 std::string id = base::GenerateGUID();
41 std::vector<std::string> new_codecs(codecs.size()); 42 std::vector<std::string> new_codecs(codecs.size());
42 for (size_t i = 0; i < codecs.size(); ++i) 43 for (size_t i = 0; i < codecs.size(); ++i)
43 new_codecs[i] = codecs[i].utf8().data(); 44 new_codecs[i] = codecs[i].utf8().data();
44 WebMediaSource::AddStatus result = 45 WebMediaSource::AddStatus result =
45 static_cast<WebMediaSource::AddStatus>( 46 static_cast<WebMediaSource::AddStatus>(
46 demuxer_->AddId(id, type.utf8().data(), new_codecs)); 47 demuxer_->AddId(id, type.utf8().data(), new_codecs,
48 use_legacy_frame_processor));
47 49
48 if (result == WebMediaSource::AddStatusOk) 50 if (result == WebMediaSource::AddStatusOk)
49 *source_buffer = new WebSourceBufferImpl(id, demuxer_); 51 *source_buffer = new WebSourceBufferImpl(id, demuxer_);
50 52
51 return result; 53 return result;
52 } 54 }
53 55
56 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
57 const blink::WebString& type,
58 const blink::WebVector<blink::WebString>& codecs,
59 blink::WebSourceBuffer** source_buffer) {
60 return addSourceBuffer(type, codecs, true, source_buffer);
61 }
62
54 double WebMediaSourceImpl::duration() { 63 double WebMediaSourceImpl::duration() {
55 return demuxer_->GetDuration(); 64 return demuxer_->GetDuration();
56 } 65 }
57 66
58 void WebMediaSourceImpl::setDuration(double new_duration) { 67 void WebMediaSourceImpl::setDuration(double new_duration) {
59 DCHECK_GE(new_duration, 0); 68 DCHECK_GE(new_duration, 0);
60 demuxer_->SetDuration(new_duration); 69 demuxer_->SetDuration(new_duration);
61 } 70 }
62 71
63 void WebMediaSourceImpl::markEndOfStream( 72 void WebMediaSourceImpl::markEndOfStream(
(...skipping 12 matching lines...) Expand all
76 } 85 }
77 86
78 demuxer_->MarkEndOfStream(pipeline_status); 87 demuxer_->MarkEndOfStream(pipeline_status);
79 } 88 }
80 89
81 void WebMediaSourceImpl::unmarkEndOfStream() { 90 void WebMediaSourceImpl::unmarkEndOfStream() {
82 demuxer_->UnmarkEndOfStream(); 91 demuxer_->UnmarkEndOfStream();
83 } 92 }
84 93
85 } // namespace content 94 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698