| 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/buffered_resource_loader.h" | 5 #include "content/renderer/media/buffered_resource_loader.h" |
| 6 | 6 |
| 7 #include "base/bits.h" | 7 #include "base/bits.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 progress_cb_ = progress_cb; | 153 progress_cb_ = progress_cb; |
| 154 | 154 |
| 155 if (first_byte_position_ != kPositionNotSpecified) { | 155 if (first_byte_position_ != kPositionNotSpecified) { |
| 156 // TODO(hclam): server may not support range request so |offset_| may not | 156 // TODO(hclam): server may not support range request so |offset_| may not |
| 157 // equal to |first_byte_position_|. | 157 // equal to |first_byte_position_|. |
| 158 offset_ = first_byte_position_; | 158 offset_ = first_byte_position_; |
| 159 } | 159 } |
| 160 | 160 |
| 161 // Prepare the request. | 161 // Prepare the request. |
| 162 WebURLRequest request(url_); | 162 WebURLRequest request(url_); |
| 163 request.setTargetType(WebURLRequest::TargetIsMedia); | 163 // TODO(mkwst): Split this into video/audio. |
| 164 request.setRequestContext(WebURLRequest::RequestContextVideo); |
| 164 | 165 |
| 165 if (IsRangeRequest()) { | 166 if (IsRangeRequest()) { |
| 166 request.setHTTPHeaderField( | 167 request.setHTTPHeaderField( |
| 167 WebString::fromUTF8(net::HttpRequestHeaders::kRange), | 168 WebString::fromUTF8(net::HttpRequestHeaders::kRange), |
| 168 WebString::fromUTF8(net::HttpByteRange::Bounded( | 169 WebString::fromUTF8(net::HttpByteRange::Bounded( |
| 169 first_byte_position_, last_byte_position_).GetHeaderValue())); | 170 first_byte_position_, last_byte_position_).GetHeaderValue())); |
| 170 } | 171 } |
| 171 | 172 |
| 172 frame->setReferrerForRequest(request, blink::WebURL()); | 173 frame->setReferrerForRequest(request, blink::WebURL()); |
| 173 | 174 |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 | 778 |
| 778 void BufferedResourceLoader::Log() { | 779 void BufferedResourceLoader::Log() { |
| 779 media_log_->AddEvent( | 780 media_log_->AddEvent( |
| 780 media_log_->CreateBufferedExtentsChangedEvent( | 781 media_log_->CreateBufferedExtentsChangedEvent( |
| 781 offset_ - buffer_.backward_bytes(), | 782 offset_ - buffer_.backward_bytes(), |
| 782 offset_, | 783 offset_, |
| 783 offset_ + buffer_.forward_bytes())); | 784 offset_ + buffer_.forward_bytes())); |
| 784 } | 785 } |
| 785 | 786 |
| 786 } // namespace content | 787 } // namespace content |
| OLD | NEW |