BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 14 insertions, 13 deletions

diff --git a/chromium/media/media_options.gni b/chromium/media/media_options.gni
index b6c63fb4e7f..19067b1751f 100644
--- a/chromium/media/media_options.gni
+++ b/chromium/media/media_options.gni
@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/chromecast_build.gni")
+import("//build/config/features.gni")
+import("//build/config/headless_build.gni")
 
 declare_args() {
   # Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
@@ -19,14 +21,10 @@ declare_args() {
   # decoding of VP9 and VP8A type content.
   media_use_libvpx = true
 
-  # Enable libwebm for multiplexing video and audio for JS recording API.
-  media_use_libwebm = true
-
-  # Neither Android nor iOS use ffmpeg, libvpx nor libwebm.
-  if (is_android || is_ios) {
+  # iOS doesn't use ffmpeg, libvpx.
+  if (is_ios) {
     media_use_ffmpeg = false
     media_use_libvpx = false
-    media_use_libwebm = false
   }
 
   # Override to dynamically link the cras (ChromeOS audio) library.
@@ -40,8 +38,8 @@ declare_args() {
 
   # Alsa should be used on non-Android, non-Mac POSIX systems, and Chromecast
   # builds for desktop Linux.
-  if (is_posix && !is_android && !is_mac &&
-      (!is_chromecast || target_cpu != "arm")) {
+  if (is_posix && !is_headless && !is_android && !is_mac &&
+      (!is_chromecast || is_cast_desktop_build)) {
     use_alsa = true
     if (!use_cras) {
       use_pulseaudio = true
@@ -51,19 +49,22 @@ declare_args() {
   # Use low-memory buffers on non-Android builds of Chromecast.
   use_low_memory_buffer = is_chromecast && !is_android
 
-  # Enables the MPEG2-TS stream parser for use with Media Source. Disabled by
-  # default (except on Chromecast) since it's not available on the normal Web
-  # Platform and costs money.
-  enable_mpeg2ts_stream_parser = is_chromecast
+  # Enables AC3/EAC3 audio demuxing. This is enabled only on Chromecast, since
+  # it only provides demuxing, and is only useful for AC3/EAC3 audio
+  # pass-through to HDMI sink on Chromecast.
+  enable_ac3_eac3_audio_demuxing = proprietary_codecs && is_chromecast
+
+  enable_mse_mpeg2ts_stream_parser = proprietary_codecs && is_chromecast
 
   # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
   # platform. Enable by default for Chromecast.
-  enable_hevc_demuxing = is_chromecast
+  enable_hevc_demuxing = proprietary_codecs && is_chromecast
 
   # Experiment to enable mojo media application: http://crbug.com/431776
   # Valid options are:
   # - "none": Do not use mojo media application.
   # - "browser": Use mojo media application hosted in the browser process.
+  # - "gpu": Use mojo media application hosted in the gpu process.
   # - "utility": Use mojo media application hosted in the utility process.
   enable_mojo_media = "none"