OLD | NEW |
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 Loading... |
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 WebMediaSource::FrameProcessorChoice frame_processor_choice, |
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(); |
| 45 |
| 46 bool use_legacy_frame_processor = false; |
| 47 switch (frame_processor_choice) { |
| 48 case UseLegacyFrameProcessor: |
| 49 use_legacy_frame_processor = true; |
| 50 break; |
| 51 case UseNewFrameProcessor: |
| 52 break; |
| 53 } |
| 54 |
44 WebMediaSource::AddStatus result = | 55 WebMediaSource::AddStatus result = |
45 static_cast<WebMediaSource::AddStatus>( | 56 static_cast<WebMediaSource::AddStatus>( |
46 demuxer_->AddId(id, type.utf8().data(), new_codecs)); | 57 demuxer_->AddId(id, type.utf8().data(), new_codecs, |
| 58 use_legacy_frame_processor)); |
47 | 59 |
48 if (result == WebMediaSource::AddStatusOk) | 60 if (result == WebMediaSource::AddStatusOk) |
49 *source_buffer = new WebSourceBufferImpl(id, demuxer_); | 61 *source_buffer = new WebSourceBufferImpl(id, demuxer_); |
50 | 62 |
51 return result; | 63 return result; |
52 } | 64 } |
53 | 65 |
54 double WebMediaSourceImpl::duration() { | 66 double WebMediaSourceImpl::duration() { |
55 return demuxer_->GetDuration(); | 67 return demuxer_->GetDuration(); |
56 } | 68 } |
(...skipping 19 matching lines...) Expand all Loading... |
76 } | 88 } |
77 | 89 |
78 demuxer_->MarkEndOfStream(pipeline_status); | 90 demuxer_->MarkEndOfStream(pipeline_status); |
79 } | 91 } |
80 | 92 |
81 void WebMediaSourceImpl::unmarkEndOfStream() { | 93 void WebMediaSourceImpl::unmarkEndOfStream() { |
82 demuxer_->UnmarkEndOfStream(); | 94 demuxer_->UnmarkEndOfStream(); |
83 } | 95 } |
84 | 96 |
85 } // namespace content | 97 } // namespace content |
OLD | NEW |