generic-library/ffmpeg-lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add fdk_aac optionnal extern decoder

Browse Source
This commit is contained in:
Edouard DUPIN 2016-11-17 21:32:43 +01:00
parent 078d9dc98f
commit 328cd9e69d
8 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
generated/Android/config.h
View File

@ -441,7 +441,6 @@
#define CONFIG_LIBDC1394 0 #define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0 #define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0 #define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0 #define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFONTCONFIG 0
#define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBFREETYPE 0
@ -1093,7 +1092,6 @@
#define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDMC_AT_DECODER 0
#define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0
#define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBILBC_DECODER 0 #define CONFIG_LIBILBC_DECODER 0
@ -1532,7 +1530,6 @@
#define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0
#define CONFIG_LIBILBC_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0

3
generated/IOs/config.h
View File

@ -441,7 +441,6 @@
#define CONFIG_LIBDC1394 0 #define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0 #define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0 #define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0 #define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFONTCONFIG 0
#define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBFREETYPE 0
@ -1094,7 +1093,6 @@
#define CONFIG_QDMC_AT_DECODER 1 #define CONFIG_QDMC_AT_DECODER 1
#define CONFIG_QDM2_AT_DECODER 1 #define CONFIG_QDM2_AT_DECODER 1
#define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBILBC_DECODER 0 #define CONFIG_LIBILBC_DECODER 0
@ -1533,7 +1531,6 @@
#define CONFIG_PCM_ALAW_AT_ENCODER 1 #define CONFIG_PCM_ALAW_AT_ENCODER 1
#define CONFIG_PCM_MULAW_AT_ENCODER 1 #define CONFIG_PCM_MULAW_AT_ENCODER 1
#define CONFIG_LIBFAAC_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0
#define CONFIG_LIBILBC_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0

3
generated/Linux/config.h
View File

@ -441,7 +441,6 @@
#define CONFIG_LIBDC1394 0 #define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0 #define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0 #define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0 #define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFONTCONFIG 0
#define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBFREETYPE 0
@ -1094,7 +1093,6 @@
#define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDMC_AT_DECODER 0
#define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0
#define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBILBC_DECODER 0 #define CONFIG_LIBILBC_DECODER 0
@ -1533,7 +1531,6 @@
#define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0
#define CONFIG_LIBILBC_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0

3
generated/MacOs/config.h
View File

@ -441,7 +441,6 @@
#define CONFIG_LIBDC1394 0 #define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0 #define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0 #define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0 #define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFONTCONFIG 0
#define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBFREETYPE 0
@ -1094,7 +1093,6 @@
#define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDMC_AT_DECODER 0
#define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0
#define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBILBC_DECODER 0 #define CONFIG_LIBILBC_DECODER 0
@ -1533,7 +1531,6 @@
#define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0
#define CONFIG_LIBILBC_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0

3
generated/Windows_32/config.h
View File

@ -441,7 +441,6 @@
#define CONFIG_LIBDC1394 0 #define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0 #define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0 #define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0 #define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFONTCONFIG 0
#define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBFREETYPE 0
@ -1094,7 +1093,6 @@
#define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDMC_AT_DECODER 0
#define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0
#define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBILBC_DECODER 0 #define CONFIG_LIBILBC_DECODER 0
@ -1533,7 +1531,6 @@
#define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0
#define CONFIG_LIBILBC_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0

3
generated/Windows_64/config.h
View File

@ -441,7 +441,6 @@
#define CONFIG_LIBDC1394 0 #define CONFIG_LIBDC1394 0
#define CONFIG_LIBEBUR128 0 #define CONFIG_LIBEBUR128 0
#define CONFIG_LIBFAAC 0 #define CONFIG_LIBFAAC 0
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_LIBFLITE 0 #define CONFIG_LIBFLITE 0
#define CONFIG_LIBFONTCONFIG 0 #define CONFIG_LIBFONTCONFIG 0
#define CONFIG_LIBFREETYPE 0 #define CONFIG_LIBFREETYPE 0
@ -1094,7 +1093,6 @@
#define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDMC_AT_DECODER 0
#define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0
#define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBILBC_DECODER 0 #define CONFIG_LIBILBC_DECODER 0
@ -1533,7 +1531,6 @@
#define CONFIG_PCM_ALAW_AT_ENCODER 0 #define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0 #define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0 #define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
#define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_ENCODER 0
#define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0
#define CONFIG_LIBILBC_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 0

1
lutinLib_ffmpegCommon.py
View File

@ -21,7 +21,6 @@ def add_generate_path(target, my_module):
def add_common_property(target, my_module): def add_common_property(target, my_module):
add_generate_path(target, my_module) add_generate_path(target, my_module)
my_module.add_flag('c', [ my_module.add_flag('c', [
"-D_ISOC99_SOURCE", "-D_ISOC99_SOURCE",
"-D_FILE_OFFSET_BITS=64", "-D_FILE_OFFSET_BITS=64",

9
lutin_ffmpeg-avcodec.py
View File

@ -968,6 +968,15 @@ def configure(target, my_module):
else: else:
debug.warning("unknow architecture ..."); debug.warning("unknow architecture ...");
my_module.add_optionnal_depend('fdk-aac',
compilation_flags=["c", ["-DCONFIG_LIBFDK_AAC=1", "-DCONFIG_LIBFDK_AAC_DECODER=1", "-DCONFIG_LIBFDK_AAC_ENCODER=1"]],
compilation_flags_not_found=["c", ["-DCONFIG_LIBFDK_AAC=0", "-DCONFIG_LIBFDK_AAC_DECODER=0", "-DCONFIG_LIBFDK_AAC_ENCODER=0"]],
src_file=[
'ffmpeg/libavcodec/libfdk-aacenc.c',
'ffmpeg/libavcodec/libfdk-aacdec.c'
]
)
#TODO : this is bad ... #TODO : this is bad ...
my_module.add_header_file([ my_module.add_header_file([
'ffmpeg/libavcodec/bsf_list.c', 'ffmpeg/libavcodec/bsf_list.c',