| 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/android/media_source_delegate.h" | 5 #include "content/renderer/media/android/media_source_delegate.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/message_loop/message_loop_proxy.h" | 11 #include "base/message_loop/message_loop_proxy.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "content/renderer/media/android/renderer_demuxer_android.h" | 13 #include "content/renderer/media/android/renderer_demuxer_android.h" |
| 14 #include "content/renderer/media/webmediaplayer_util.h" | 14 #include "content/renderer/media/webmediaplayer_util.h" |
| 15 #include "content/renderer/media/webmediasource_impl.h" | 15 #include "content/renderer/media/webmediasource_impl.h" |
| 16 #include "media/base/android/demuxer_stream_player_params.h" | 16 #include "media/base/android/demuxer_stream_player_params.h" |
| 17 #include "media/base/bind_to_loop.h" | 17 #include "media/base/bind_to_current_loop.h" |
| 18 #include "media/base/demuxer_stream.h" | 18 #include "media/base/demuxer_stream.h" |
| 19 #include "media/base/media_log.h" | 19 #include "media/base/media_log.h" |
| 20 #include "media/filters/chunk_demuxer.h" | 20 #include "media/filters/chunk_demuxer.h" |
| 21 #include "media/filters/decrypting_demuxer_stream.h" | 21 #include "media/filters/decrypting_demuxer_stream.h" |
| 22 #include "third_party/WebKit/public/platform/WebString.h" | 22 #include "third_party/WebKit/public/platform/WebString.h" |
| 23 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 23 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
| 24 | 24 |
| 25 using media::DemuxerStream; | 25 using media::DemuxerStream; |
| 26 using media::DemuxerConfigs; | 26 using media::DemuxerConfigs; |
| 27 using media::DemuxerData; | 27 using media::DemuxerData; |
| (...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 // current time have been garbage collected or removed by the web app, this is | 829 // current time have been garbage collected or removed by the web app, this is |
| 830 // unlikely. This may cause unexpected playback stall due to seek pending an | 830 // unlikely. This may cause unexpected playback stall due to seek pending an |
| 831 // append for a GOP prior to the last GOP demuxed. | 831 // append for a GOP prior to the last GOP demuxed. |
| 832 // TODO(wolenetz): Remove the possibility for this seek to cause unexpected | 832 // TODO(wolenetz): Remove the possibility for this seek to cause unexpected |
| 833 // player stall by replaying cached data since last keyframe in browser player | 833 // player stall by replaying cached data since last keyframe in browser player |
| 834 // rather than issuing browser seek. See http://crbug.com/304234. | 834 // rather than issuing browser seek. See http://crbug.com/304234. |
| 835 return seek_time; | 835 return seek_time; |
| 836 } | 836 } |
| 837 | 837 |
| 838 } // namespace content | 838 } // namespace content |
| OLD | NEW |