diff options
| author | dalecurtis <dalecurtis@chromium.org> | 2016-03-11 08:32:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 16:34:02 +0000 |
| commit | 43631fe1435e3c79467550b2cf797383d4cba8e6 (patch) | |
| tree | 4ff5f7aa5038cce391e760eff220f0c46554e695 /content/browser/media | |
| parent | b09acb30bb05049938812b2600a57fd57f9b2fdc (diff) | |
| download | chromium_src-43631fe1435e3c79467550b2cf797383d4cba8e6.zip chromium_src-43631fe1435e3c79467550b2cf797383d4cba8e6.tar.gz chromium_src-43631fe1435e3c79467550b2cf797383d4cba8e6.tar.bz2 | |
Flip proprietary codecs to false for Android chromium builds.
Official builds still using branding=Chrome so they will continue
to support codecs and containers like h264, mp3, aac, and mp4.
Adds support for video/webm videos using vp8,vorbis to the webview
tests so they will continue to work w/o proprietary codecs.
We have approval to do this now. Summary will be posted to the
src= launch bug: http://crbug.com/533190#c17
This will require some changes to the build flags for the official
WebView AOSP builders, which I'll land shortly after this.
BUG=570762
TEST=webview tests pass.
Review URL: https://codereview.chromium.org/1577433004
Cr-Commit-Position: refs/heads/master@{#380649}
Diffstat (limited to 'content/browser/media')
| -rw-r--r-- | content/browser/media/media_canplaytype_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc index 0b70f41..1a3af5a 100644 --- a/content/browser/media/media_canplaytype_browsertest.cc +++ b/content/browser/media/media_canplaytype_browsertest.cc @@ -42,8 +42,8 @@ const char* kOggVideoMaybe = kNot; const char* kTheoraProbably = kNot; const char* kOggOpusProbably = kNot; const char* kMpeg2AacProbably = kNot; // https://crbug.com/544268. -const char* kHlsProbably = kProbably; -const char* kHlsMaybe = kMaybe; +const char* kHlsProbably = kPropProbably; +const char* kHlsMaybe = kPropMaybe; #endif // !OS_ANDROID #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |