|
|
Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer."
Not all WebMediaPlayer implementations know how to play HLS, and
if the URL does not contain an HLS identifier originally, a later
redirect might break playback if the wrong implementation is
chosen.
When this occurs instead re-trigger Blink's loader with the
redirected source URL that contains the proper HLS tagging.
It's preferred to do this instead of either adding a shim WMP
implementation that choses the real WMP during load() or making
createWebMediaPlayer() block until redirects complete and then
throwing away the data from those connections.
BUG= 618109
TEST=Manually tested espn.go.com and adds a new browser test.
Review-Url: https://codereview.chromium.org/2046253002
Cr-Commit-Position: refs/heads/master@{#401777}
(cherry picked from commit ea27a3ed74612a72945993222b01f6aaddccbfe4)
Committed: https://chromium.googlesource.com/chromium/src/+/46079771558372f7090b96de2c0c4596ac130696
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+153 lines, -25 lines) |
Patch |
 |
M |
content/browser/media/media_browsertest.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/browser/media/media_browsertest.cc
|
View
|
|
2 chunks |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
A |
content/browser/media/media_redirect_browsertest.cc
|
View
|
|
1 chunk |
+67 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/content_tests.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
content/renderer/media/webmediaplayer_ms_unittest.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
media/base/android/media_codec_util.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
media/base/android/media_codec_util.cc
|
View
|
|
1 chunk |
+5 lines, -13 lines |
0 comments
|
Download
|
 |
M |
media/blink/buffered_data_source.h
|
View
|
|
2 chunks |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/blink/buffered_data_source.cc
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/blink/multibuffer_data_source.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/blink/multibuffer_data_source.cc
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/blink/webmediaplayer_impl.cc
|
View
|
|
2 chunks |
+21 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/blink/webmediaplayer_impl_unittest.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
A |
media/test/data/bear.m3u8
|
View
|
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
A |
media/test/data/bear0.ts
|
View
|
|
Binary file |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
View
|
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
|
View
|
|
6 chunks |
+15 lines, -7 lines |
0 comments
|
Download
|
 |
M |
third_party/WebKit/public/platform/WebMediaPlayerClient.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
Total messages: 2 (1 generated)
|