oasis

commit: fc47c7322d7e43e47df41c7e8c5ad955a60e278b
parent aa0f1e10f4b22b7cae828cc6fd7a336f8d8bbefe
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 18 Aug 2020 13:41:33 -0700

ffmpeg: Enable opus encoding through libopus

Diffstat:
M
pkg/ffmpeg/gen.lua
6
++++++
M
pkg/ffmpeg/options.h
22
+++++++++++-----------

2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua
@@ -104,6 +104,12 @@ for lib, srcs in pairs(sources) do
 	sources[lib] = table.keys(srcs)
 end
 
+if options.CONFIG_LIBOPUS_ENCODER or options.CONFIG_LIBOPUS_DECODER then
+	cflags{'-isystem $builddir/pkg/opus/include'}
+	table.insert(pkg.deps, 'pkg/opus/headers')
+	table.insert(sources.libavcodec, '$builddir/pkg/opus/libopus.a')
+end
+
 lib('libavcodec.a', {
 	expand{'libavcodec/', {
 		'ac3_parser.c',
diff --git a/pkg/ffmpeg/options.h b/pkg/ffmpeg/options.h
@@ -455,7 +455,7 @@
 #define CONFIG_LIBOPENH264 0
 #define CONFIG_LIBOPENJPEG 0
 #define CONFIG_LIBOPENMPT 0
-#define CONFIG_LIBOPUS 0
+#define CONFIG_LIBOPUS 1
 #define CONFIG_LIBPULSE 0
 #define CONFIG_LIBRABBITMQ 0
 #define CONFIG_LIBRAV1E 0
@@ -579,7 +579,7 @@
 #define CONFIG_XMM_CLOBBER_TEST 0
 #define CONFIG_BSFS 0
 #define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 0
+#define CONFIG_ENCODERS 1
 #define CONFIG_HWACCELS 0
 #define CONFIG_PARSERS 1
 #define CONFIG_INDEVS 0
@@ -591,7 +591,7 @@
 #define CONFIG_AANDCTTABLES 0
 #define CONFIG_AC3DSP 1
 #define CONFIG_ADTS_HEADER 1
-#define CONFIG_AUDIO_FRAME_QUEUE 0
+#define CONFIG_AUDIO_FRAME_QUEUE 1
 #define CONFIG_AUDIODSP 0
 #define CONFIG_BLOCKDSP 1
 #define CONFIG_BSWAPDSP 1
@@ -1052,7 +1052,7 @@
 #define CONFIG_MPC8_DECODER 0
 #define CONFIG_NELLYMOSER_DECODER 0
 #define CONFIG_ON2AVC_DECODER 0
-#define CONFIG_OPUS_DECODER 1
+#define CONFIG_OPUS_DECODER 0
 #define CONFIG_PAF_AUDIO_DECODER 0
 #define CONFIG_QCELP_DECODER 0
 #define CONFIG_QDM2_DECODER 0
@@ -1221,7 +1221,7 @@
 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
 #define CONFIG_LIBOPENJPEG_DECODER 0
-#define CONFIG_LIBOPUS_DECODER 0
+#define CONFIG_LIBOPUS_DECODER 1
 #define CONFIG_LIBRSVG_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
@@ -1422,7 +1422,7 @@
 #define CONFIG_LIBMP3LAME_ENCODER 0
 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
 #define CONFIG_LIBOPENJPEG_ENCODER 0
-#define CONFIG_LIBOPUS_ENCODER 0
+#define CONFIG_LIBOPUS_ENCODER 1
 #define CONFIG_LIBRAV1E_ENCODER 0
 #define CONFIG_LIBSHINE_ENCODER 0
 #define CONFIG_LIBSPEEX_ENCODER 0
@@ -1625,7 +1625,7 @@
 #define CONFIG_AFFTDN_FILTER 0
 #define CONFIG_AFFTFILT_FILTER 0
 #define CONFIG_AFIR_FILTER 0
-#define CONFIG_AFORMAT_FILTER 0
+#define CONFIG_AFORMAT_FILTER 1
 #define CONFIG_AGATE_FILTER 0
 #define CONFIG_AIIR_FILTER 0
 #define CONFIG_AINTEGRAL_FILTER 0
@@ -1640,13 +1640,13 @@
 #define CONFIG_ANEQUALIZER_FILTER 0
 #define CONFIG_ANLMDN_FILTER 0
 #define CONFIG_ANLMS_FILTER 0
-#define CONFIG_ANULL_FILTER 0
+#define CONFIG_ANULL_FILTER 1
 #define CONFIG_APAD_FILTER 0
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_APULSATOR_FILTER 0
 #define CONFIG_AREALTIME_FILTER 0
-#define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_ARESAMPLE_FILTER 1
 #define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ARNNDN_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
@@ -2235,7 +2235,7 @@
 #define CONFIG_NSV_DEMUXER 0
 #define CONFIG_NUT_DEMUXER 0
 #define CONFIG_NUV_DEMUXER 0
-#define CONFIG_OGG_DEMUXER 0
+#define CONFIG_OGG_DEMUXER 1
 #define CONFIG_OMA_DEMUXER 0
 #define CONFIG_PAF_DEMUXER 0
 #define CONFIG_PCM_ALAW_DEMUXER 0
@@ -2475,7 +2475,7 @@
 #define CONFIG_OGG_MUXER 0
 #define CONFIG_OGV_MUXER 0
 #define CONFIG_OMA_MUXER 0
-#define CONFIG_OPUS_MUXER 0
+#define CONFIG_OPUS_MUXER 1
 #define CONFIG_PCM_ALAW_MUXER 0
 #define CONFIG_PCM_MULAW_MUXER 0
 #define CONFIG_PCM_VIDC_MUXER 0