[third_party/ffmpeg] Enable sbc encoder.
TEST: Used to build mediaplayer.
Change-Id: Ifd9be1a054e1ce60e68d44e727bd369e88e3fe38
diff --git a/BUILD.gn b/BUILD.gn
index 92048d5..0e7fde2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("ffmpeg_options.gni")
import("ffmpeg_generated.gni")
+import("ffmpeg_options.gni")
# Path to configuration files.
ffmpeg_config_root = "fuchsia/config/$ffmpeg_profile/$current_cpu"
@@ -75,6 +75,9 @@
# ffmpeg doesn't follow usual parentheses conventions.
"-Wno-logical-op-parentheses",
+ # ffmpeg doesn't care about indexing strings with pointer arithmetic.
+ "-Wno-string-plus-int",
+
# ffmpeg doesn't care about pointer signedness.
"-Wno-parentheses",
diff --git a/CREDITS.fuchsia b/CREDITS.fuchsia
index 8e8165e..26f4901 100644
--- a/CREDITS.fuchsia
+++ b/CREDITS.fuchsia
@@ -174,9 +174,9 @@
********************************************************************************
-libswresample/swresample.h
+libswresample/version.h
-Copyright (C) 2011-2013 Michael Niedermayer (michaelni@gmx.at)
+Version macros.
This file is part of libswresample
@@ -196,9 +196,9 @@
********************************************************************************
-libswresample/version.h
+libswresample/swresample.h
-Version macros.
+Copyright (C) 2011-2013 Michael Niedermayer (michaelni@gmx.at)
This file is part of libswresample
diff --git a/README.fuchsia b/README.fuchsia
index 416e866..3e72472 100644
--- a/README.fuchsia
+++ b/README.fuchsia
@@ -77,8 +77,8 @@
# built as part of fuchsia, and clang is in buildtools.
# Make sure the two sysroots you will need are available, namely
- # ../../buildtools/linux-x64/sysroot and
- # ../../buildtools/linux-arm64/sysroot
+ # ../../build/third_party/sysroot/linux-x64 and
+ # ../../build/third_party/sysroot/linux-arm64
# The x64 version will be present on x64 linux hosts. The arm64 version
# can be obtained using cipd install.
diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
index f427f51..4ef9b90 100644
--- a/ffmpeg_generated.gni
+++ b/ffmpeg_generated.gni
@@ -1,4 +1,4 @@
-# Copyright 2018 The Fuchsia Authors. All rights reserved.
+# Copyright 2019 The Fuchsia Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -45,6 +45,7 @@
"libavcodec/flacdata.c",
"libavcodec/flacdec.c",
"libavcodec/flacdsp.c",
+ "libavcodec/frame_thread_encoder.c",
"libavcodec/golomb.c",
"libavcodec/h264pred.c",
"libavcodec/hpeldsp.c",
@@ -86,6 +87,9 @@
"libavcodec/sbc.c",
"libavcodec/sbcdec.c",
"libavcodec/sbcdec_data.c",
+ "libavcodec/sbcdsp.c",
+ "libavcodec/sbcdsp_data.c",
+ "libavcodec/sbcenc.c",
"libavcodec/utils.c",
"libavcodec/videodsp.c",
"libavcodec/vorbis.c",
@@ -336,6 +340,7 @@
"libavcodec/x86/hpeldsp_init.c",
"libavcodec/x86/hpeldsp_vp3_init.c",
"libavcodec/x86/mpegaudiodsp.c",
+ "libavcodec/x86/sbcdsp_init.c",
"libavcodec/x86/videodsp_init.c",
"libavcodec/x86/vorbisdsp_init.c",
"libavcodec/x86/vp3dsp_init.c",
@@ -360,6 +365,7 @@
"libavcodec/x86/hpeldsp.asm",
"libavcodec/x86/hpeldsp_vp3.asm",
"libavcodec/x86/imdct36.asm",
+ "libavcodec/x86/sbcdsp.asm",
"libavcodec/x86/videodsp.asm",
"libavcodec/x86/vorbisdsp.asm",
"libavcodec/x86/vp3dsp.asm",
diff --git a/fuchsia/config/default/arm64/config.h b/fuchsia/config/default/arm64/config.h
index b26df9d..cd9220f 100644
--- a/fuchsia/config/default/arm64/config.h
+++ b/fuchsia/config/default/arm64/config.h
@@ -1,12 +1,12 @@
/* 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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --sysroot=/usr/local/google/home/dalesat/fuchsia/third_party/ffmpeg/../../buildtools/linux-arm64/sysroot --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --disable-linux-perf --disable-error-resilience"
+#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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --enable-encoder=sbc --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --sysroot=/usr/local/google/home/turnage/fuchsia/third_party/ffmpeg/../../build/third_party/sysroot/linux-arm64 --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --disable-linux-perf --disable-error-resilience"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define CONFIG_THIS_YEAR 2018
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Fuchsia clang version 8.0.0 (https://fuchsia.googlesource.com/a/third_party/clang 0a217961416a0cbf1ac29bcb26577d41ca0e0e8d) (https://fuchsia.googlesource.com/a/third_party/llvm aff6cf491087ba32e338c9af076c9b7739c978a0) (based on LLVM 8.0.0svn)"
+#define CC_IDENT "Fuchsia clang version 9.0.0 (https://fuchsia.googlesource.com/a/third_party/llvm-project 023dd1eefad3c3b41633e0644df2e0d29f66d728) (based on LLVM 9.0.0svn)"
#define av_restrict restrict
#define EXTERN_PREFIX ""
#define EXTERN_ASM
@@ -488,7 +488,7 @@
#define CONFIG_OPENAL 0
#define CONFIG_OPENGL 0
#define CONFIG_VAPOURSYNTH 0
-#define CONFIG_ALSA 1
+#define CONFIG_ALSA 0
#define CONFIG_APPKIT 0
#define CONFIG_AVFOUNDATION 0
#define CONFIG_BZLIB 0
@@ -575,7 +575,7 @@
#define CONFIG_XMM_CLOBBER_TEST 0
#define CONFIG_BSFS 1
#define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 0
+#define CONFIG_ENCODERS 1
#define CONFIG_HWACCELS 0
#define CONFIG_PARSERS 1
#define CONFIG_INDEVS 0
@@ -608,7 +608,7 @@
#define CONFIG_FDCTDSP 0
#define CONFIG_FLACDSP 1
#define CONFIG_FMTCONVERT 0
-#define CONFIG_FRAME_THREAD_ENCODER 0
+#define CONFIG_FRAME_THREAD_ENCODER 1
#define CONFIG_G722DSP 0
#define CONFIG_GOLOMB 1
#define CONFIG_GPLV3 0
@@ -1305,7 +1305,7 @@
#define CONFIG_NELLYMOSER_ENCODER 0
#define CONFIG_OPUS_ENCODER 0
#define CONFIG_RA_144_ENCODER 0
-#define CONFIG_SBC_ENCODER 0
+#define CONFIG_SBC_ENCODER 1
#define CONFIG_SONIC_ENCODER 0
#define CONFIG_SONIC_LS_ENCODER 0
#define CONFIG_TRUEHD_ENCODER 0
diff --git a/fuchsia/config/default/arm64/libavcodec/codec_list.c b/fuchsia/config/default/arm64/libavcodec/codec_list.c
index da1e4e9..29fd0c6 100644
--- a/fuchsia/config/default/arm64/libavcodec/codec_list.c
+++ b/fuchsia/config/default/arm64/libavcodec/codec_list.c
@@ -1,4 +1,5 @@
static const AVCodec * const codec_list[] = {
+ &ff_sbc_encoder,
&ff_theora_decoder,
&ff_vp3_decoder,
&ff_vp8_decoder,
diff --git a/fuchsia/config/default/arm64/libavutil/ffversion.h b/fuchsia/config/default/arm64/libavutil/ffversion.h
index b97c110..4b18061 100644
--- a/fuchsia/config/default/arm64/libavutil/ffversion.h
+++ b/fuchsia/config/default/arm64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-92356-g750018e43a"
+#define FFMPEG_VERSION "N-92360-g18571e04d0"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/fuchsia/config/default/x64/config.asm b/fuchsia/config/default/x64/config.asm
index 5a46da1..8884714 100644
--- a/fuchsia/config/default/x64/config.asm
+++ b/fuchsia/config/default/x64/config.asm
@@ -473,7 +473,7 @@
%define CONFIG_OPENAL 0
%define CONFIG_OPENGL 0
%define CONFIG_VAPOURSYNTH 0
-%define CONFIG_ALSA 1
+%define CONFIG_ALSA 0
%define CONFIG_APPKIT 0
%define CONFIG_AVFOUNDATION 0
%define CONFIG_BZLIB 0
@@ -560,7 +560,7 @@
%define CONFIG_XMM_CLOBBER_TEST 0
%define CONFIG_BSFS 1
%define CONFIG_DECODERS 1
-%define CONFIG_ENCODERS 0
+%define CONFIG_ENCODERS 1
%define CONFIG_HWACCELS 0
%define CONFIG_PARSERS 1
%define CONFIG_INDEVS 0
@@ -593,7 +593,7 @@
%define CONFIG_FDCTDSP 0
%define CONFIG_FLACDSP 1
%define CONFIG_FMTCONVERT 0
-%define CONFIG_FRAME_THREAD_ENCODER 0
+%define CONFIG_FRAME_THREAD_ENCODER 1
%define CONFIG_G722DSP 0
%define CONFIG_GOLOMB 1
%define CONFIG_GPLV3 0
@@ -1290,7 +1290,7 @@
%define CONFIG_NELLYMOSER_ENCODER 0
%define CONFIG_OPUS_ENCODER 0
%define CONFIG_RA_144_ENCODER 0
-%define CONFIG_SBC_ENCODER 0
+%define CONFIG_SBC_ENCODER 1
%define CONFIG_SONIC_ENCODER 0
%define CONFIG_SONIC_LS_ENCODER 0
%define CONFIG_TRUEHD_ENCODER 0
diff --git a/fuchsia/config/default/x64/config.h b/fuchsia/config/default/x64/config.h
index aa9528f..de71439 100644
--- a/fuchsia/config/default/x64/config.h
+++ b/fuchsia/config/default/x64/config.h
@@ -1,12 +1,12 @@
/* 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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-decoder=vp9 --enable-parser=vp9 --sysroot=/usr/local/google/home/dalesat/fuchsia/third_party/ffmpeg/../../buildtools/linux-x64/sysroot --extra-ldflags='-fuse-ld=lld' --disable-error-resilience"
+#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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --enable-encoder=sbc --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-decoder=vp9 --enable-parser=vp9 --sysroot=/usr/local/google/home/turnage/fuchsia/third_party/ffmpeg/../../build/third_party/sysroot/linux-x64 --disable-error-resilience"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define CONFIG_THIS_YEAR 2018
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Fuchsia clang version 8.0.0 (https://fuchsia.googlesource.com/a/third_party/clang 0a217961416a0cbf1ac29bcb26577d41ca0e0e8d) (https://fuchsia.googlesource.com/a/third_party/llvm aff6cf491087ba32e338c9af076c9b7739c978a0) (based on LLVM 8.0.0svn)"
+#define CC_IDENT "Fuchsia clang version 9.0.0 (https://fuchsia.googlesource.com/a/third_party/llvm-project 023dd1eefad3c3b41633e0644df2e0d29f66d728) (based on LLVM 9.0.0svn)"
#define av_restrict restrict
#define EXTERN_PREFIX ""
#define EXTERN_ASM
@@ -488,7 +488,7 @@
#define CONFIG_OPENAL 0
#define CONFIG_OPENGL 0
#define CONFIG_VAPOURSYNTH 0
-#define CONFIG_ALSA 1
+#define CONFIG_ALSA 0
#define CONFIG_APPKIT 0
#define CONFIG_AVFOUNDATION 0
#define CONFIG_BZLIB 0
@@ -575,7 +575,7 @@
#define CONFIG_XMM_CLOBBER_TEST 0
#define CONFIG_BSFS 1
#define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 0
+#define CONFIG_ENCODERS 1
#define CONFIG_HWACCELS 0
#define CONFIG_PARSERS 1
#define CONFIG_INDEVS 0
@@ -608,7 +608,7 @@
#define CONFIG_FDCTDSP 0
#define CONFIG_FLACDSP 1
#define CONFIG_FMTCONVERT 0
-#define CONFIG_FRAME_THREAD_ENCODER 0
+#define CONFIG_FRAME_THREAD_ENCODER 1
#define CONFIG_G722DSP 0
#define CONFIG_GOLOMB 1
#define CONFIG_GPLV3 0
@@ -1305,7 +1305,7 @@
#define CONFIG_NELLYMOSER_ENCODER 0
#define CONFIG_OPUS_ENCODER 0
#define CONFIG_RA_144_ENCODER 0
-#define CONFIG_SBC_ENCODER 0
+#define CONFIG_SBC_ENCODER 1
#define CONFIG_SONIC_ENCODER 0
#define CONFIG_SONIC_LS_ENCODER 0
#define CONFIG_TRUEHD_ENCODER 0
diff --git a/fuchsia/config/default/x64/libavcodec/codec_list.c b/fuchsia/config/default/x64/libavcodec/codec_list.c
index e54e1a7..62b17b8 100644
--- a/fuchsia/config/default/x64/libavcodec/codec_list.c
+++ b/fuchsia/config/default/x64/libavcodec/codec_list.c
@@ -1,4 +1,5 @@
static const AVCodec * const codec_list[] = {
+ &ff_sbc_encoder,
&ff_theora_decoder,
&ff_vp3_decoder,
&ff_vp8_decoder,
diff --git a/fuchsia/config/default/x64/libavutil/ffversion.h b/fuchsia/config/default/x64/libavutil/ffversion.h
index b97c110..4b18061 100644
--- a/fuchsia/config/default/x64/libavutil/ffversion.h
+++ b/fuchsia/config/default/x64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-92356-g750018e43a"
+#define FFMPEG_VERSION "N-92360-g18571e04d0"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/fuchsia/config/max/arm64/config.h b/fuchsia/config/max/arm64/config.h
index 49b23e0..538ad37 100644
--- a/fuchsia/config/max/arm64/config.h
+++ b/fuchsia/config/max/arm64/config.h
@@ -1,12 +1,12 @@
/* 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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --sysroot=/usr/local/google/home/dalesat/fuchsia/third_party/ffmpeg/../../buildtools/linux-arm64/sysroot --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --disable-linux-perf --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
+#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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --enable-encoder=sbc --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --sysroot=/usr/local/google/home/turnage/fuchsia/third_party/ffmpeg/../../build/third_party/sysroot/linux-arm64 --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --disable-linux-perf --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define CONFIG_THIS_YEAR 2018
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Fuchsia clang version 8.0.0 (https://fuchsia.googlesource.com/a/third_party/clang 0a217961416a0cbf1ac29bcb26577d41ca0e0e8d) (https://fuchsia.googlesource.com/a/third_party/llvm aff6cf491087ba32e338c9af076c9b7739c978a0) (based on LLVM 8.0.0svn)"
+#define CC_IDENT "Fuchsia clang version 9.0.0 (https://fuchsia.googlesource.com/a/third_party/llvm-project 023dd1eefad3c3b41633e0644df2e0d29f66d728) (based on LLVM 9.0.0svn)"
#define av_restrict restrict
#define EXTERN_PREFIX ""
#define EXTERN_ASM
@@ -488,7 +488,7 @@
#define CONFIG_OPENAL 0
#define CONFIG_OPENGL 0
#define CONFIG_VAPOURSYNTH 0
-#define CONFIG_ALSA 1
+#define CONFIG_ALSA 0
#define CONFIG_APPKIT 0
#define CONFIG_AVFOUNDATION 0
#define CONFIG_BZLIB 0
@@ -575,7 +575,7 @@
#define CONFIG_XMM_CLOBBER_TEST 0
#define CONFIG_BSFS 1
#define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 0
+#define CONFIG_ENCODERS 1
#define CONFIG_HWACCELS 0
#define CONFIG_PARSERS 1
#define CONFIG_INDEVS 0
@@ -608,7 +608,7 @@
#define CONFIG_FDCTDSP 1
#define CONFIG_FLACDSP 1
#define CONFIG_FMTCONVERT 0
-#define CONFIG_FRAME_THREAD_ENCODER 0
+#define CONFIG_FRAME_THREAD_ENCODER 1
#define CONFIG_G722DSP 0
#define CONFIG_GOLOMB 1
#define CONFIG_GPLV3 0
@@ -1305,7 +1305,7 @@
#define CONFIG_NELLYMOSER_ENCODER 0
#define CONFIG_OPUS_ENCODER 0
#define CONFIG_RA_144_ENCODER 0
-#define CONFIG_SBC_ENCODER 0
+#define CONFIG_SBC_ENCODER 1
#define CONFIG_SONIC_ENCODER 0
#define CONFIG_SONIC_LS_ENCODER 0
#define CONFIG_TRUEHD_ENCODER 0
diff --git a/fuchsia/config/max/arm64/libavcodec/codec_list.c b/fuchsia/config/max/arm64/libavcodec/codec_list.c
index dad3153..9b4cf02 100644
--- a/fuchsia/config/max/arm64/libavcodec/codec_list.c
+++ b/fuchsia/config/max/arm64/libavcodec/codec_list.c
@@ -1,4 +1,5 @@
static const AVCodec * const codec_list[] = {
+ &ff_sbc_encoder,
&ff_h263_decoder,
&ff_h264_decoder,
&ff_mpeg4_decoder,
diff --git a/fuchsia/config/max/arm64/libavutil/ffversion.h b/fuchsia/config/max/arm64/libavutil/ffversion.h
index b97c110..4b18061 100644
--- a/fuchsia/config/max/arm64/libavutil/ffversion.h
+++ b/fuchsia/config/max/arm64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-92356-g750018e43a"
+#define FFMPEG_VERSION "N-92360-g18571e04d0"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/fuchsia/config/max/x64/config.asm b/fuchsia/config/max/x64/config.asm
index 8b69748..df4af90 100644
--- a/fuchsia/config/max/x64/config.asm
+++ b/fuchsia/config/max/x64/config.asm
@@ -473,7 +473,7 @@
%define CONFIG_OPENAL 0
%define CONFIG_OPENGL 0
%define CONFIG_VAPOURSYNTH 0
-%define CONFIG_ALSA 1
+%define CONFIG_ALSA 0
%define CONFIG_APPKIT 0
%define CONFIG_AVFOUNDATION 0
%define CONFIG_BZLIB 0
@@ -560,7 +560,7 @@
%define CONFIG_XMM_CLOBBER_TEST 0
%define CONFIG_BSFS 1
%define CONFIG_DECODERS 1
-%define CONFIG_ENCODERS 0
+%define CONFIG_ENCODERS 1
%define CONFIG_HWACCELS 0
%define CONFIG_PARSERS 1
%define CONFIG_INDEVS 0
@@ -593,7 +593,7 @@
%define CONFIG_FDCTDSP 1
%define CONFIG_FLACDSP 1
%define CONFIG_FMTCONVERT 0
-%define CONFIG_FRAME_THREAD_ENCODER 0
+%define CONFIG_FRAME_THREAD_ENCODER 1
%define CONFIG_G722DSP 0
%define CONFIG_GOLOMB 1
%define CONFIG_GPLV3 0
@@ -1290,7 +1290,7 @@
%define CONFIG_NELLYMOSER_ENCODER 0
%define CONFIG_OPUS_ENCODER 0
%define CONFIG_RA_144_ENCODER 0
-%define CONFIG_SBC_ENCODER 0
+%define CONFIG_SBC_ENCODER 1
%define CONFIG_SONIC_ENCODER 0
%define CONFIG_SONIC_LS_ENCODER 0
%define CONFIG_TRUEHD_ENCODER 0
diff --git a/fuchsia/config/max/x64/config.h b/fuchsia/config/max/x64/config.h
index 36efc42..a935efe 100644
--- a/fuchsia/config/max/x64/config.h
+++ b/fuchsia/config/max/x64/config.h
@@ -1,12 +1,12 @@
/* 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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-decoder=vp9 --enable-parser=vp9 --sysroot=/usr/local/google/home/dalesat/fuchsia/third_party/ffmpeg/../../buildtools/linux-x64/sysroot --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
+#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 --disable-debug --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-decoder='theora,vp8,sbc,aptx' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --enable-parser='vp3,vp8' --enable-encoder=sbc --optflags='\"-O2\"' --enable-pic --x86asmexe=yasm --enable-pic --enable-lto --cc=clang --cxx=clang++ --ld=clang --enable-decoder=vp9 --enable-parser=vp9 --sysroot=/usr/local/google/home/turnage/fuchsia/third_party/ffmpeg/../../build/third_party/sysroot/linux-x64 --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define CONFIG_THIS_YEAR 2018
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Fuchsia clang version 8.0.0 (https://fuchsia.googlesource.com/a/third_party/clang 0a217961416a0cbf1ac29bcb26577d41ca0e0e8d) (https://fuchsia.googlesource.com/a/third_party/llvm aff6cf491087ba32e338c9af076c9b7739c978a0) (based on LLVM 8.0.0svn)"
+#define CC_IDENT "Fuchsia clang version 9.0.0 (https://fuchsia.googlesource.com/a/third_party/llvm-project 023dd1eefad3c3b41633e0644df2e0d29f66d728) (based on LLVM 9.0.0svn)"
#define av_restrict restrict
#define EXTERN_PREFIX ""
#define EXTERN_ASM
@@ -488,7 +488,7 @@
#define CONFIG_OPENAL 0
#define CONFIG_OPENGL 0
#define CONFIG_VAPOURSYNTH 0
-#define CONFIG_ALSA 1
+#define CONFIG_ALSA 0
#define CONFIG_APPKIT 0
#define CONFIG_AVFOUNDATION 0
#define CONFIG_BZLIB 0
@@ -575,7 +575,7 @@
#define CONFIG_XMM_CLOBBER_TEST 0
#define CONFIG_BSFS 1
#define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 0
+#define CONFIG_ENCODERS 1
#define CONFIG_HWACCELS 0
#define CONFIG_PARSERS 1
#define CONFIG_INDEVS 0
@@ -608,7 +608,7 @@
#define CONFIG_FDCTDSP 1
#define CONFIG_FLACDSP 1
#define CONFIG_FMTCONVERT 0
-#define CONFIG_FRAME_THREAD_ENCODER 0
+#define CONFIG_FRAME_THREAD_ENCODER 1
#define CONFIG_G722DSP 0
#define CONFIG_GOLOMB 1
#define CONFIG_GPLV3 0
@@ -1305,7 +1305,7 @@
#define CONFIG_NELLYMOSER_ENCODER 0
#define CONFIG_OPUS_ENCODER 0
#define CONFIG_RA_144_ENCODER 0
-#define CONFIG_SBC_ENCODER 0
+#define CONFIG_SBC_ENCODER 1
#define CONFIG_SONIC_ENCODER 0
#define CONFIG_SONIC_LS_ENCODER 0
#define CONFIG_TRUEHD_ENCODER 0
diff --git a/fuchsia/config/max/x64/libavcodec/codec_list.c b/fuchsia/config/max/x64/libavcodec/codec_list.c
index c226e2e..8c59888 100644
--- a/fuchsia/config/max/x64/libavcodec/codec_list.c
+++ b/fuchsia/config/max/x64/libavcodec/codec_list.c
@@ -1,4 +1,5 @@
static const AVCodec * const codec_list[] = {
+ &ff_sbc_encoder,
&ff_h263_decoder,
&ff_h264_decoder,
&ff_mpeg4_decoder,
diff --git a/fuchsia/config/max/x64/libavutil/ffversion.h b/fuchsia/config/max/x64/libavutil/ffversion.h
index b97c110..4b18061 100644
--- a/fuchsia/config/max/x64/libavutil/ffversion.h
+++ b/fuchsia/config/max/x64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-92356-g750018e43a"
+#define FFMPEG_VERSION "N-92360-g18571e04d0"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/fuchsia/scripts/build_ffmpeg.py b/fuchsia/scripts/build_ffmpeg.py
index edf0120..99c442b 100755
--- a/fuchsia/scripts/build_ffmpeg.py
+++ b/fuchsia/scripts/build_ffmpeg.py
@@ -173,6 +173,7 @@
'--enable-demuxer=ogg,matroska,wav,flac,mp3,mov',
'--enable-parser=opus,vorbis,flac,mpegaudio',
'--enable-parser=vp3,vp8',
+ '--enable-encoder=sbc',
'--optflags="-O2"',
'--enable-pic',
@@ -190,7 +191,6 @@
])
- # TODO(dalesat): determine if we can use --enable-lto in x64
# TODO(dalesat): enable vp9 on arm64
if target_arch == 'x64':
@@ -198,8 +198,7 @@
'--enable-decoder=vp9',
'--enable-parser=vp9',
'--sysroot=' + os.path.join(
- FFMPEG_DIR, '..', '..', 'buildtools', 'linux-x64', 'sysroot'),
- '--extra-ldflags=-fuse-ld=lld',
+ FFMPEG_DIR, '..', '..', 'build', 'third_party', 'sysroot', 'linux-x64'),
])
elif target_arch == 'arm64':
configure_flags['Common'].extend([
@@ -210,7 +209,7 @@
'--enable-armv8',
'--extra-cflags=-march=armv8-a',
'--sysroot=' + os.path.join(
- FFMPEG_DIR, '..', '..', 'buildtools', 'linux-arm64', 'sysroot'),
+ FFMPEG_DIR, '..', '..', 'build', 'third_party', 'sysroot', 'linux-arm64'),
'--extra-cflags=--target=aarch64-linux-gnu',
'--extra-ldflags=--target=aarch64-linux-gnu',
'--disable-linux-perf',
