[chromium-freeworld: 118/148] actually fix mp3 playback support

commit 74ee2445dae5312b3cacf8970b1a7a0b369c6632 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Fri Jun 16 15:40:59 2017 -0400 actually fix mp3 playback support chromium-59.0.3071.86-enable-mp3.patch | 477 +++++++++++++++++++++++++++++++++ chromium.spec | 7 +- 2 files changed, 482 insertions(+), 2 deletions(-) --- diff --git a/chromium-59.0.3071.86-enable-mp3.patch b/chromium-59.0.3071.86-enable-mp3.patch new file mode 100644 index 0000000..d727324 --- /dev/null +++ b/chromium-59.0.3071.86-enable-mp3.patch @@ -0,0 +1,477 @@ +diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/button-press.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/button-press +diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/hit.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/hit +diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached +diff -up chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3 chromium-59.0.3071.86/media/base/mime_util_internal.cc +--- chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3 2017-06-05 15:03:08.000000000 -0400 ++++ chromium-59.0.3071.86/media/base/mime_util_internal.cc 2017-06-15 12:37:05.162650032 -0400 +@@ -286,10 +286,10 @@ 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) + CodecSet mp3_codecs; + mp3_codecs.insert(MP3); + ++#if BUILDFLAG(USE_PROPRIETARY_CODECS) + CodecSet aac; + aac.insert(MPEG2_AAC); + aac.insert(MPEG4_AAC); +@@ -333,10 +333,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()); +@@ -789,7 +789,6 @@ bool MimeUtil::IsCodecProprietary(Codec + case INVALID_CODEC: + case AC3: + case EAC3: +- case MP3: + case MPEG2_AAC: + case MPEG4_AAC: + case H264: +@@ -797,6 +796,7 @@ bool MimeUtil::IsCodecProprietary(Codec + case DOLBY_VISION: + return true; + ++ case MP3: + case PCM: + case VORBIS: + case OPUS: +diff -up chromium-59.0.3071.86/media/BUILD.gn.mp3 chromium-59.0.3071.86/media/BUILD.gn +--- chromium-59.0.3071.86/media/BUILD.gn.mp3 2017-06-15 12:48:07.277772389 -0400 ++++ chromium-59.0.3071.86/media/BUILD.gn 2017-06-15 12:50:34.342911710 -0400 +@@ -229,6 +229,14 @@ component("media") { + "formats/webm/webm_video_client.h", + "formats/webm/webm_webvtt_parser.cc", + "formats/webm/webm_webvtt_parser.h", ++ "formats/mpeg/adts_constants.cc", ++ "formats/mpeg/adts_constants.h", ++ "formats/mpeg/adts_stream_parser.cc", ++ "formats/mpeg/adts_stream_parser.h", ++ "formats/mpeg/mpeg1_audio_stream_parser.cc", ++ "formats/mpeg/mpeg1_audio_stream_parser.h", ++ "formats/mpeg/mpeg_audio_stream_parser_base.cc", ++ "formats/mpeg/mpeg_audio_stream_parser_base.h", + "muxers/webm_muxer.cc", + "muxers/webm_muxer.h", + "renderers/audio_renderer_impl.cc", +@@ -442,14 +450,6 @@ component("media") { + "formats/mp4/sample_to_group_iterator.h", + "formats/mp4/track_run_iterator.cc", + "formats/mp4/track_run_iterator.h", +- "formats/mpeg/adts_constants.cc", +- "formats/mpeg/adts_constants.h", +- "formats/mpeg/adts_stream_parser.cc", +- "formats/mpeg/adts_stream_parser.h", +- "formats/mpeg/mpeg1_audio_stream_parser.cc", +- "formats/mpeg/mpeg1_audio_stream_parser.h", +- "formats/mpeg/mpeg_audio_stream_parser_base.cc", +- "formats/mpeg/mpeg_audio_stream_parser_base.h", + ] + if (enable_mse_mpeg2ts_stream_parser) { + sources += [ +diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h +--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 2017-06-16 14:34:19.233333696 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h 2017-06-16 14:35:36.235836034 -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/usr/local/google/home/tguilbert/Code/chromium/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/usr/local/google/home/tguilbert/Code/chromium/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" +@@ -550,7 +550,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 +@@ -617,8 +617,8 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -957,7 +957,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 +@@ -1263,7 +1263,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 +@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h +--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 2017-06-16 14:33:03.565804834 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h 2017-06-16 14:34:00.538697021 -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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp 8' --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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp 8' --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" +@@ -550,7 +550,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 +@@ -617,8 +617,8 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -957,7 +957,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 +@@ -1263,7 +1263,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 +@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h +--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 2017-06-16 14:35:50.558558013 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h 2017-06-16 14:36:34.140710462 -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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp 8' --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/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp 8' --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" +@@ -550,7 +550,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 +@@ -617,8 +617,8 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -957,7 +957,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 +@@ -1263,7 +1263,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 +@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h +--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 2017-06-16 14:31:10.694999531 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2017-06-16 14:32:48.921089988 -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/usr/local/google/home/tguilbert/Code/chromium/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/usr/local/google/home/tguilbert/Code/chromium/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" +@@ -550,7 +550,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 +@@ -617,8 +617,8 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -957,7 +957,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 +@@ -1263,7 +1263,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 +@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h +--- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 2017-06-16 14:27:17.782528334 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2017-06-16 14:29:24.962054946 -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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable -decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto" ++#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/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable -decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto --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" +@@ -550,7 +550,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 +@@ -617,8 +617,8 @@ + #define CONFIG_LZF 0 + #define CONFIG_ME_CMP 0 + #define CONFIG_MPEG_ER 0 +-#define CONFIG_MPEGAUDIO 0 +-#define CONFIG_MPEGAUDIODSP 0 ++#define CONFIG_MPEGAUDIO 1 ++#define CONFIG_MPEGAUDIODSP 1 + #define CONFIG_MPEGVIDEO 0 + #define CONFIG_MPEGVIDEOENC 0 + #define CONFIG_MSS34DSP 0 +@@ -957,7 +957,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 +@@ -1263,7 +1263,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 +@@ -2196,7 +2196,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-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni +--- chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-06-08 11:40:39.000000000 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni 2017-06-15 12:37:05.163650012 -0400 +@@ -177,19 +177,12 @@ if ((is_linux && current_cpu == "arm" && + ] + } + +-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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu = = "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++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_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) ++{ + 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/ac3tab.c", + "libavcodec/cbrt_data.c", + "libavcodec/dct.c", + "libavcodec/dct32_fixed.c", +@@ -205,7 +198,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", +@@ -214,6 +206,21 @@ 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_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu = = "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) ++{ ++ 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_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", +@@ -315,21 +322,31 @@ if ((is_linux && current_cpu == "x64") | + if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/x86/aacpsdsp_init.c", ++ ] ++} ++ ++if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && 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_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { + ffmpeg_yasm_sources += [ +- "libavcodec/x86/aacpsdsp.asm", + "libavcodec/x86/dct32.asm", + "libavcodec/x86/imdct36.asm", + "libavcodec/x86/sbrdsp.asm", + ] + } + ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++ ffmpeg_yasm_sources += [ ++ "libavcodec/x86/aacpsdsp.asm", ++ ] ++} ++ + if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) { + ffmpeg_c_sources += [ + "libavcodec/arm/h264pred_init_arm.c", +diff -up chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c +--- chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-06-08 11:40:41.000000000 -0400 ++++ chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-06-15 12:37:05.163650012 -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-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart +diff -up chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping diff --git a/chromium.spec b/chromium.spec index 9d618e9..27f27e0 100644 --- a/chromium.spec +++ b/chromium.spec @@ -110,7 +110,7 @@ BuildRequires: libicu-devel >= 5.4 Name: chromium%{chromium_channel} Version: %{majorversion}.0.3071.86 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) @@ -165,7 +165,7 @@ Patch31: chromium-56.0.2924.87-fpermissive.patch # Thanks to Ben Noordhuis Patch33: chromium-59.0.3071.86-gcc7.patch # Enable mp3 support -Patch34: chromium-58.0.3029.81-enable-mp3.patch +Patch34: chromium-59.0.3071.86-enable-mp3.patch # Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8... # https://bugs.chromium.org/p/chromium/issues/detail?id=712737 # https://bugzilla.redhat.com/show_bug.cgi?id=1446851 @@ -1627,6 +1627,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Fri Jun 16 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 59.0.3071.86-4 +- actually fix mp3 playback support + * Tue Jun 13 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 59.0.3071.86-3 - fix filtering