485 lines
34 KiB
Diff
485 lines
34 KiB
Diff
|
diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/button-press.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/button-press
|
||
|
|
diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/hit.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/hit
|
||
|
|
diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/score-reached.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/score-reached
|
||
|
|
diff -up chromium-62.0.3202.62/media/base/mime_util_internal.cc.mp3 chromium-62.0.3202.62/media/base/mime_util_internal.cc
|
||
|
|
--- chromium-62.0.3202.62/media/base/mime_util_internal.cc.mp3 2017-10-17 15:10:44.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/media/base/mime_util_internal.cc 2017-10-18 09:32:16.957562156 -0400
|
||
|
|
@@ -266,15 +266,19 @@ void MimeUtil::AddSupportedMediaFormats(
|
||
|
|
CodecSet webm_codecs(webm_audio_codecs);
|
||
|
|
webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
|
||
|
|
|
||
|
|
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
||
|
|
const CodecSet mp3_codecs{MP3};
|
||
|
|
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
||
|
|
const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
|
||
|
|
+#else
|
||
|
|
+ const CodecSet aac{};
|
||
|
|
+#endif
|
||
|
|
+ CodecSet mp4_audio_codecs(aac);
|
||
|
|
+ mp4_audio_codecs.emplace(MP3);
|
||
|
|
|
||
|
|
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
||
|
|
CodecSet avc_and_aac(aac);
|
||
|
|
avc_and_aac.emplace(H264);
|
||
|
|
|
||
|
|
- CodecSet mp4_audio_codecs(aac);
|
||
|
|
- mp4_audio_codecs.emplace(MP3);
|
||
|
|
mp4_audio_codecs.emplace(FLAC);
|
||
|
|
#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
|
||
|
|
mp4_audio_codecs.emplace(AC3);
|
||
|
|
@@ -311,10 +315,10 @@ void MimeUtil::AddSupportedMediaFormats(
|
||
|
|
AddContainerWithCodecs("application/ogg", ogg_codecs, false);
|
||
|
|
AddContainerWithCodecs("audio/flac", implicit_codec, false);
|
||
|
|
|
||
|
|
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
||
|
|
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
|
||
|
|
AddContainerWithCodecs("audio/mp3", implicit_codec, true);
|
||
|
|
AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
|
||
|
|
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
||
|
|
AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS.
|
||
|
|
AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
|
||
|
|
DCHECK(!mp4_video_codecs.empty());
|
||
|
|
@@ -920,7 +924,6 @@ bool MimeUtil::IsCodecProprietary(Codec
|
||
|
|
case INVALID_CODEC:
|
||
|
|
case AC3:
|
||
|
|
case EAC3:
|
||
|
|
- case MP3:
|
||
|
|
case MPEG2_AAC:
|
||
|
|
case MPEG4_AAC:
|
||
|
|
case H264:
|
||
|
|
@@ -928,6 +931,7 @@ bool MimeUtil::IsCodecProprietary(Codec
|
||
|
|
case DOLBY_VISION:
|
||
|
|
return true;
|
||
|
|
|
||
|
|
+ case MP3:
|
||
|
|
case PCM:
|
||
|
|
case VORBIS:
|
||
|
|
case OPUS:
|
||
|
|
diff -up chromium-62.0.3202.62/media/formats/BUILD.gn.mp3 chromium-62.0.3202.62/media/formats/BUILD.gn
|
||
|
|
--- chromium-62.0.3202.62/media/formats/BUILD.gn.mp3 2017-10-17 15:10:45.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/media/formats/BUILD.gn 2017-10-18 09:25:18.353676481 -0400
|
||
|
|
@@ -17,6 +17,14 @@ source_set("formats") {
|
||
|
|
"ac3/ac3_util.h",
|
||
|
|
"common/offset_byte_queue.cc",
|
||
|
|
"common/offset_byte_queue.h",
|
||
|
|
+ "mpeg/adts_constants.cc",
|
||
|
|
+ "mpeg/adts_constants.h",
|
||
|
|
+ "mpeg/adts_stream_parser.cc",
|
||
|
|
+ "mpeg/adts_stream_parser.h",
|
||
|
|
+ "mpeg/mpeg1_audio_stream_parser.cc",
|
||
|
|
+ "mpeg/mpeg1_audio_stream_parser.h",
|
||
|
|
+ "mpeg/mpeg_audio_stream_parser_base.cc",
|
||
|
|
+ "mpeg/mpeg_audio_stream_parser_base.h",
|
||
|
|
"webm/webm_audio_client.cc",
|
||
|
|
"webm/webm_audio_client.h",
|
||
|
|
"webm/webm_cluster_parser.cc",
|
||
|
|
@@ -78,14 +86,6 @@ source_set("formats") {
|
||
|
|
"mp4/sample_to_group_iterator.h",
|
||
|
|
"mp4/track_run_iterator.cc",
|
||
|
|
"mp4/track_run_iterator.h",
|
||
|
|
- "mpeg/adts_constants.cc",
|
||
|
|
- "mpeg/adts_constants.h",
|
||
|
|
- "mpeg/adts_stream_parser.cc",
|
||
|
|
- "mpeg/adts_stream_parser.h",
|
||
|
|
- "mpeg/mpeg1_audio_stream_parser.cc",
|
||
|
|
- "mpeg/mpeg1_audio_stream_parser.h",
|
||
|
|
- "mpeg/mpeg_audio_stream_parser_base.cc",
|
||
|
|
- "mpeg/mpeg_audio_stream_parser_base.h",
|
||
|
|
]
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-62.0.3202.62/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 2017-10-18 09:05:31.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h 2017-10-18 09:25:18.354676462 -0400
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
/* Automatically generated by configure - do not modify! */
|
||
|
|
#ifndef FFMPEG_CONFIG_H
|
||
|
|
#define FFMPEG_CONFIG_H
|
||
|
|
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
|
||
|
|
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
|
||
|
|
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||
|
|
#define CONFIG_THIS_YEAR 2017
|
||
|
|
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||
|
|
@@ -542,7 +542,7 @@
|
||
|
|
#define CONFIG_FFPROBE 0
|
||
|
|
#define CONFIG_FFSERVER 0
|
||
|
|
#define CONFIG_FFMPEG 0
|
||
|
|
-#define CONFIG_DCT 0
|
||
|
|
+#define CONFIG_DCT 1
|
||
|
|
#define CONFIG_DWT 0
|
||
|
|
#define CONFIG_ERROR_RESILIENCE 0
|
||
|
|
#define CONFIG_FAAN 1
|
||
|
|
@@ -620,9 +620,9 @@
|
||
|
|
#define CONFIG_LZF 0
|
||
|
|
#define CONFIG_ME_CMP 0
|
||
|
|
#define CONFIG_MPEG_ER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO 0
|
||
|
|
-#define CONFIG_MPEGAUDIODSP 0
|
||
|
|
-#define CONFIG_MPEGAUDIOHEADER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO 1
|
||
|
|
+#define CONFIG_MPEGAUDIODSP 1
|
||
|
|
+#define CONFIG_MPEGAUDIOHEADER 1
|
||
|
|
#define CONFIG_MPEGVIDEO 0
|
||
|
|
#define CONFIG_MPEGVIDEOENC 0
|
||
|
|
#define CONFIG_MSS34DSP 0
|
||
|
|
@@ -968,7 +968,7 @@
|
||
|
|
#define CONFIG_MP1FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP2_DECODER 0
|
||
|
|
#define CONFIG_MP2FLOAT_DECODER 0
|
||
|
|
-#define CONFIG_MP3_DECODER 0
|
||
|
|
+#define CONFIG_MP3_DECODER 1
|
||
|
|
#define CONFIG_MP3FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP3ADU_DECODER 0
|
||
|
|
#define CONFIG_MP3ADUFLOAT_DECODER 0
|
||
|
|
@@ -1275,7 +1275,7 @@
|
||
|
|
#define CONFIG_MM_DEMUXER 0
|
||
|
|
#define CONFIG_MMF_DEMUXER 0
|
||
|
|
#define CONFIG_MOV_DEMUXER 0
|
||
|
|
-#define CONFIG_MP3_DEMUXER 0
|
||
|
|
+#define CONFIG_MP3_DEMUXER 1
|
||
|
|
#define CONFIG_MPC_DEMUXER 0
|
||
|
|
#define CONFIG_MPC8_DEMUXER 0
|
||
|
|
#define CONFIG_MPEGPS_DEMUXER 0
|
||
|
|
@@ -2217,7 +2217,7 @@
|
||
|
|
#define CONFIG_MJPEG_PARSER 0
|
||
|
|
#define CONFIG_MLP_PARSER 0
|
||
|
|
#define CONFIG_MPEG4VIDEO_PARSER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO_PARSER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO_PARSER 1
|
||
|
|
#define CONFIG_MPEGVIDEO_PARSER 0
|
||
|
|
#define CONFIG_OPUS_PARSER 1
|
||
|
|
#define CONFIG_PNG_PARSER 0
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 2017-10-18 09:05:31.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h 2017-10-18 09:25:18.355676443 -0400
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
/* Automatically generated by configure - do not modify! */
|
||
|
|
#ifndef FFMPEG_CONFIG_H
|
||
|
|
#define FFMPEG_CONFIG_H
|
||
|
|
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
|
||
|
|
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
|
||
|
|
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||
|
|
#define CONFIG_THIS_YEAR 2017
|
||
|
|
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||
|
|
@@ -542,7 +542,7 @@
|
||
|
|
#define CONFIG_FFPROBE 0
|
||
|
|
#define CONFIG_FFSERVER 0
|
||
|
|
#define CONFIG_FFMPEG 0
|
||
|
|
-#define CONFIG_DCT 0
|
||
|
|
+#define CONFIG_DCT 1
|
||
|
|
#define CONFIG_DWT 0
|
||
|
|
#define CONFIG_ERROR_RESILIENCE 0
|
||
|
|
#define CONFIG_FAAN 1
|
||
|
|
@@ -620,9 +620,9 @@
|
||
|
|
#define CONFIG_LZF 0
|
||
|
|
#define CONFIG_ME_CMP 0
|
||
|
|
#define CONFIG_MPEG_ER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO 0
|
||
|
|
-#define CONFIG_MPEGAUDIODSP 0
|
||
|
|
-#define CONFIG_MPEGAUDIOHEADER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO 1
|
||
|
|
+#define CONFIG_MPEGAUDIODSP 1
|
||
|
|
+#define CONFIG_MPEGAUDIOHEADER 1
|
||
|
|
#define CONFIG_MPEGVIDEO 0
|
||
|
|
#define CONFIG_MPEGVIDEOENC 0
|
||
|
|
#define CONFIG_MSS34DSP 0
|
||
|
|
@@ -968,7 +968,7 @@
|
||
|
|
#define CONFIG_MP1FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP2_DECODER 0
|
||
|
|
#define CONFIG_MP2FLOAT_DECODER 0
|
||
|
|
-#define CONFIG_MP3_DECODER 0
|
||
|
|
+#define CONFIG_MP3_DECODER 1
|
||
|
|
#define CONFIG_MP3FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP3ADU_DECODER 0
|
||
|
|
#define CONFIG_MP3ADUFLOAT_DECODER 0
|
||
|
|
@@ -1275,7 +1275,7 @@
|
||
|
|
#define CONFIG_MM_DEMUXER 0
|
||
|
|
#define CONFIG_MMF_DEMUXER 0
|
||
|
|
#define CONFIG_MOV_DEMUXER 0
|
||
|
|
-#define CONFIG_MP3_DEMUXER 0
|
||
|
|
+#define CONFIG_MP3_DEMUXER 1
|
||
|
|
#define CONFIG_MPC_DEMUXER 0
|
||
|
|
#define CONFIG_MPC8_DEMUXER 0
|
||
|
|
#define CONFIG_MPEGPS_DEMUXER 0
|
||
|
|
@@ -2217,7 +2217,7 @@
|
||
|
|
#define CONFIG_MJPEG_PARSER 0
|
||
|
|
#define CONFIG_MLP_PARSER 0
|
||
|
|
#define CONFIG_MPEG4VIDEO_PARSER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO_PARSER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO_PARSER 1
|
||
|
|
#define CONFIG_MPEGVIDEO_PARSER 0
|
||
|
|
#define CONFIG_OPUS_PARSER 1
|
||
|
|
#define CONFIG_PNG_PARSER 0
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 2017-10-18 09:05:31.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h 2017-10-18 09:25:18.360676348 -0400
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
/* Automatically generated by configure - do not modify! */
|
||
|
|
#ifndef FFMPEG_CONFIG_H
|
||
|
|
#define FFMPEG_CONFIG_H
|
||
|
|
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
|
||
|
|
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
|
||
|
|
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||
|
|
#define CONFIG_THIS_YEAR 2017
|
||
|
|
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||
|
|
@@ -542,7 +542,7 @@
|
||
|
|
#define CONFIG_FFPROBE 0
|
||
|
|
#define CONFIG_FFSERVER 0
|
||
|
|
#define CONFIG_FFMPEG 0
|
||
|
|
-#define CONFIG_DCT 0
|
||
|
|
+#define CONFIG_DCT 1
|
||
|
|
#define CONFIG_DWT 0
|
||
|
|
#define CONFIG_ERROR_RESILIENCE 0
|
||
|
|
#define CONFIG_FAAN 1
|
||
|
|
@@ -620,9 +620,9 @@
|
||
|
|
#define CONFIG_LZF 0
|
||
|
|
#define CONFIG_ME_CMP 0
|
||
|
|
#define CONFIG_MPEG_ER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO 0
|
||
|
|
-#define CONFIG_MPEGAUDIODSP 0
|
||
|
|
-#define CONFIG_MPEGAUDIOHEADER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO 1
|
||
|
|
+#define CONFIG_MPEGAUDIODSP 1
|
||
|
|
+#define CONFIG_MPEGAUDIOHEADER 1
|
||
|
|
#define CONFIG_MPEGVIDEO 0
|
||
|
|
#define CONFIG_MPEGVIDEOENC 0
|
||
|
|
#define CONFIG_MSS34DSP 0
|
||
|
|
@@ -968,7 +968,7 @@
|
||
|
|
#define CONFIG_MP1FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP2_DECODER 0
|
||
|
|
#define CONFIG_MP2FLOAT_DECODER 0
|
||
|
|
-#define CONFIG_MP3_DECODER 0
|
||
|
|
+#define CONFIG_MP3_DECODER 1
|
||
|
|
#define CONFIG_MP3FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP3ADU_DECODER 0
|
||
|
|
#define CONFIG_MP3ADUFLOAT_DECODER 0
|
||
|
|
@@ -1275,7 +1275,7 @@
|
||
|
|
#define CONFIG_MM_DEMUXER 0
|
||
|
|
#define CONFIG_MMF_DEMUXER 0
|
||
|
|
#define CONFIG_MOV_DEMUXER 0
|
||
|
|
-#define CONFIG_MP3_DEMUXER 0
|
||
|
|
+#define CONFIG_MP3_DEMUXER 1
|
||
|
|
#define CONFIG_MPC_DEMUXER 0
|
||
|
|
#define CONFIG_MPC8_DEMUXER 0
|
||
|
|
#define CONFIG_MPEGPS_DEMUXER 0
|
||
|
|
@@ -2217,7 +2217,7 @@
|
||
|
|
#define CONFIG_MJPEG_PARSER 0
|
||
|
|
#define CONFIG_MLP_PARSER 0
|
||
|
|
#define CONFIG_MPEG4VIDEO_PARSER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO_PARSER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO_PARSER 1
|
||
|
|
#define CONFIG_MPEGVIDEO_PARSER 0
|
||
|
|
#define CONFIG_OPUS_PARSER 1
|
||
|
|
#define CONFIG_PNG_PARSER 0
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 2017-10-18 09:05:31.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2017-10-18 09:25:18.360676348 -0400
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
/* Automatically generated by configure - do not modify! */
|
||
|
|
#ifndef FFMPEG_CONFIG_H
|
||
|
|
#define FFMPEG_CONFIG_H
|
||
|
|
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
|
||
|
|
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
|
||
|
|
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||
|
|
#define CONFIG_THIS_YEAR 2017
|
||
|
|
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||
|
|
@@ -542,7 +542,7 @@
|
||
|
|
#define CONFIG_FFPROBE 0
|
||
|
|
#define CONFIG_FFSERVER 0
|
||
|
|
#define CONFIG_FFMPEG 0
|
||
|
|
-#define CONFIG_DCT 0
|
||
|
|
+#define CONFIG_DCT 1
|
||
|
|
#define CONFIG_DWT 0
|
||
|
|
#define CONFIG_ERROR_RESILIENCE 0
|
||
|
|
#define CONFIG_FAAN 1
|
||
|
|
@@ -620,9 +620,9 @@
|
||
|
|
#define CONFIG_LZF 0
|
||
|
|
#define CONFIG_ME_CMP 0
|
||
|
|
#define CONFIG_MPEG_ER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO 0
|
||
|
|
-#define CONFIG_MPEGAUDIODSP 0
|
||
|
|
-#define CONFIG_MPEGAUDIOHEADER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO 1
|
||
|
|
+#define CONFIG_MPEGAUDIODSP 1
|
||
|
|
+#define CONFIG_MPEGAUDIOHEADER 1
|
||
|
|
#define CONFIG_MPEGVIDEO 0
|
||
|
|
#define CONFIG_MPEGVIDEOENC 0
|
||
|
|
#define CONFIG_MSS34DSP 0
|
||
|
|
@@ -968,7 +968,7 @@
|
||
|
|
#define CONFIG_MP1FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP2_DECODER 0
|
||
|
|
#define CONFIG_MP2FLOAT_DECODER 0
|
||
|
|
-#define CONFIG_MP3_DECODER 0
|
||
|
|
+#define CONFIG_MP3_DECODER 1
|
||
|
|
#define CONFIG_MP3FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP3ADU_DECODER 0
|
||
|
|
#define CONFIG_MP3ADUFLOAT_DECODER 0
|
||
|
|
@@ -1275,7 +1275,7 @@
|
||
|
|
#define CONFIG_MM_DEMUXER 0
|
||
|
|
#define CONFIG_MMF_DEMUXER 0
|
||
|
|
#define CONFIG_MOV_DEMUXER 0
|
||
|
|
-#define CONFIG_MP3_DEMUXER 0
|
||
|
|
+#define CONFIG_MP3_DEMUXER 1
|
||
|
|
#define CONFIG_MPC_DEMUXER 0
|
||
|
|
#define CONFIG_MPC8_DEMUXER 0
|
||
|
|
#define CONFIG_MPEGPS_DEMUXER 0
|
||
|
|
@@ -2217,7 +2217,7 @@
|
||
|
|
#define CONFIG_MJPEG_PARSER 0
|
||
|
|
#define CONFIG_MLP_PARSER 0
|
||
|
|
#define CONFIG_MPEG4VIDEO_PARSER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO_PARSER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO_PARSER 1
|
||
|
|
#define CONFIG_MPEGVIDEO_PARSER 0
|
||
|
|
#define CONFIG_OPUS_PARSER 1
|
||
|
|
#define CONFIG_PNG_PARSER 0
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 2017-10-18 09:05:31.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2017-10-18 09:25:18.361676329 -0400
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
/* Automatically generated by configure - do not modify! */
|
||
|
|
#ifndef FFMPEG_CONFIG_H
|
||
|
|
#define FFMPEG_CONFIG_H
|
||
|
|
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic"
|
||
|
|
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
|
||
|
|
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||
|
|
#define CONFIG_THIS_YEAR 2017
|
||
|
|
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
||
|
|
@@ -542,7 +542,7 @@
|
||
|
|
#define CONFIG_FFPROBE 0
|
||
|
|
#define CONFIG_FFSERVER 0
|
||
|
|
#define CONFIG_FFMPEG 0
|
||
|
|
-#define CONFIG_DCT 0
|
||
|
|
+#define CONFIG_DCT 1
|
||
|
|
#define CONFIG_DWT 0
|
||
|
|
#define CONFIG_ERROR_RESILIENCE 0
|
||
|
|
#define CONFIG_FAAN 1
|
||
|
|
@@ -620,9 +620,9 @@
|
||
|
|
#define CONFIG_LZF 0
|
||
|
|
#define CONFIG_ME_CMP 0
|
||
|
|
#define CONFIG_MPEG_ER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO 0
|
||
|
|
-#define CONFIG_MPEGAUDIODSP 0
|
||
|
|
-#define CONFIG_MPEGAUDIOHEADER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO 1
|
||
|
|
+#define CONFIG_MPEGAUDIODSP 1
|
||
|
|
+#define CONFIG_MPEGAUDIOHEADER 1
|
||
|
|
#define CONFIG_MPEGVIDEO 0
|
||
|
|
#define CONFIG_MPEGVIDEOENC 0
|
||
|
|
#define CONFIG_MSS34DSP 0
|
||
|
|
@@ -968,7 +968,7 @@
|
||
|
|
#define CONFIG_MP1FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP2_DECODER 0
|
||
|
|
#define CONFIG_MP2FLOAT_DECODER 0
|
||
|
|
-#define CONFIG_MP3_DECODER 0
|
||
|
|
+#define CONFIG_MP3_DECODER 1
|
||
|
|
#define CONFIG_MP3FLOAT_DECODER 0
|
||
|
|
#define CONFIG_MP3ADU_DECODER 0
|
||
|
|
#define CONFIG_MP3ADUFLOAT_DECODER 0
|
||
|
|
@@ -1275,7 +1275,7 @@
|
||
|
|
#define CONFIG_MM_DEMUXER 0
|
||
|
|
#define CONFIG_MMF_DEMUXER 0
|
||
|
|
#define CONFIG_MOV_DEMUXER 0
|
||
|
|
-#define CONFIG_MP3_DEMUXER 0
|
||
|
|
+#define CONFIG_MP3_DEMUXER 1
|
||
|
|
#define CONFIG_MPC_DEMUXER 0
|
||
|
|
#define CONFIG_MPC8_DEMUXER 0
|
||
|
|
#define CONFIG_MPEGPS_DEMUXER 0
|
||
|
|
@@ -2217,7 +2217,7 @@
|
||
|
|
#define CONFIG_MJPEG_PARSER 0
|
||
|
|
#define CONFIG_MLP_PARSER 0
|
||
|
|
#define CONFIG_MPEG4VIDEO_PARSER 0
|
||
|
|
-#define CONFIG_MPEGAUDIO_PARSER 0
|
||
|
|
+#define CONFIG_MPEGAUDIO_PARSER 1
|
||
|
|
#define CONFIG_MPEGVIDEO_PARSER 0
|
||
|
|
#define CONFIG_OPUS_PARSER 1
|
||
|
|
#define CONFIG_PNG_PARSER 0
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-10-18 09:05:28.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni 2017-10-18 09:25:18.362676310 -0400
|
||
|
|
@@ -182,17 +182,9 @@ if ((is_mac) || (is_win) || (use_linux_c
|
||
|
|
]
|
||
|
|
}
|
||
|
|
|
||
|
|
-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
|
||
|
|
+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
|
||
|
|
ffmpeg_c_sources += [
|
||
|
|
- "libavcodec/aac_ac3_parser.c",
|
||
|
|
- "libavcodec/aac_parser.c",
|
||
|
|
- "libavcodec/aacadtsdec.c",
|
||
|
|
- "libavcodec/aacps_float.c",
|
||
|
|
- "libavcodec/aacpsdsp_float.c",
|
||
|
|
- "libavcodec/aacsbr.c",
|
||
|
|
- "libavcodec/aactab.c",
|
||
|
|
"libavcodec/ac3tab.c",
|
||
|
|
- "libavcodec/autorename_libavcodec_aacdec.c",
|
||
|
|
"libavcodec/autorename_libavcodec_mpegaudiodsp.c",
|
||
|
|
"libavcodec/autorename_libavcodec_sbrdsp.c",
|
||
|
|
"libavcodec/cbrt_data.c",
|
||
|
|
@@ -210,7 +202,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
|
||
|
|
"libavcodec/mpegaudiodsp_float.c",
|
||
|
|
"libavcodec/sinewin.c",
|
||
|
|
"libavcodec/sinewin_fixed.c",
|
||
|
|
- "libavformat/aacdec.c",
|
||
|
|
"libavformat/apetag.c",
|
||
|
|
"libavformat/img2.c",
|
||
|
|
"libavformat/mov.c",
|
||
|
|
@@ -219,6 +210,20 @@ if ((current_cpu == "x64" && ffmpeg_bran
|
||
|
|
]
|
||
|
|
}
|
||
|
|
|
||
|
|
+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
|
||
|
|
+ ffmpeg_c_sources += [
|
||
|
|
+ "libavcodec/aac_ac3_parser.c",
|
||
|
|
+ "libavcodec/aac_parser.c",
|
||
|
|
+ "libavcodec/aacadtsdec.c",
|
||
|
|
+ "libavcodec/aacps_float.c",
|
||
|
|
+ "libavcodec/aacpsdsp_float.c",
|
||
|
|
+ "libavcodec/aacsbr.c",
|
||
|
|
+ "libavcodec/aactab.c",
|
||
|
|
+ "libavcodec/autorename_libavcodec_aacdec.c",
|
||
|
|
+ "libavformat/aacdec.c",
|
||
|
|
+ ]
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
|
||
|
|
ffmpeg_c_sources += [
|
||
|
|
"libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
|
||
|
|
@@ -322,15 +327,19 @@ if ((is_mac) || (is_win) || (use_linux_c
|
||
|
|
if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
|
||
|
|
ffmpeg_c_sources += [
|
||
|
|
"libavcodec/x86/aacpsdsp_init.c",
|
||
|
|
+ ]
|
||
|
|
+ ffmpeg_yasm_sources += [
|
||
|
|
+ "libavcodec/x86/aacpsdsp.asm",
|
||
|
|
+ ]
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86") || (is_win)) {
|
||
|
|
+ ffmpeg_c_sources += [
|
||
|
|
"libavcodec/x86/dct_init.c",
|
||
|
|
"libavcodec/x86/mpegaudiodsp.c",
|
||
|
|
"libavcodec/x86/sbrdsp_init.c",
|
||
|
|
]
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
|
||
|
|
ffmpeg_yasm_sources += [
|
||
|
|
- "libavcodec/x86/aacpsdsp.asm",
|
||
|
|
"libavcodec/x86/dct32.asm",
|
||
|
|
"libavcodec/x86/imdct36.asm",
|
||
|
|
"libavcodec/x86/sbrdsp.asm",
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c
|
||
|
|
--- chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-10-18 09:05:30.000000000 -0400
|
||
|
|
+++ chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-10-18 09:25:18.362676310 -0400
|
||
|
|
@@ -23,6 +23,7 @@
|
||
|
|
#define USE_FIXED 0
|
||
|
|
|
||
|
|
#include "aac.h"
|
||
|
|
+#include "aacsbrdata.h"
|
||
|
|
#include "config.h"
|
||
|
|
#include "libavutil/attributes.h"
|
||
|
|
#include "libavutil/intfloat.h"
|
||
|
|
diff -up chromium-62.0.3202.62/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-62.0.3202.62/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
|
||
|
|
diff -up chromium-62.0.3202.62/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-62.0.3202.62/tools/android/audio_focus_grabber/java/res/raw/ping
|