From 004bf2ede0b5ba9cd596bfe00e6acb3d23bb683c Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Sun, 17 Jun 2018 21:01:14 +0200 Subject: [PATCH] Create 0001-dynamic-loading-of-shared-fdk-aac-library.patch --- ...ic-loading-of-shared-fdk-aac-library.patch | 261 ++++++++++++++++++ 1 file changed, 261 insertions(+) create mode 100644 patches/0001-dynamic-loading-of-shared-fdk-aac-library.patch diff --git a/patches/0001-dynamic-loading-of-shared-fdk-aac-library.patch b/patches/0001-dynamic-loading-of-shared-fdk-aac-library.patch new file mode 100644 index 0000000..e5555da --- /dev/null +++ b/patches/0001-dynamic-loading-of-shared-fdk-aac-library.patch @@ -0,0 +1,261 @@ +From 3429a813b77a7658d2ee59be7c9228e306d86d14 Mon Sep 17 00:00:00 2001 +From: sherpya +Date: Sun, 4 Dec 2016 01:28:51 +0100 +Subject: [PATCH 1/6] dynamic loading of shared fdk-aac library + +--- + configure | 6 ++-- + libavcodec/libfdk-aacdec.c | 73 ++++++++++++++++++++++++++++++++++++++++++++-- + libavcodec/libfdk-aacenc.c | 59 +++++++++++++++++++++++++++++++++++-- + 3 files changed, 129 insertions(+), 9 deletions(-) + +diff --git a/configure b/configure +index 0b01a221c7..9dae091033 100755 +--- a/configure ++++ b/configure +@@ -1563,7 +1563,6 @@ EXTERNAL_LIBRARY_GPL_LIST=" + EXTERNAL_LIBRARY_NONFREE_LIST=" + decklink + libndi_newtek +- libfdk_aac + openssl + libtls + " +@@ -1597,6 +1596,7 @@ EXTERNAL_LIBRARY_LIST=" + libcaca + libcelt + libdc1394 ++ libfdk_aac + libdrm + libflite + libfontconfig +@@ -5841,9 +5841,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && + enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas + enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new + enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion +-enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || +- { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && +- warn "using libfdk without pkg-config"; } } ++enabled libfdk_aac && { check_header fdk-aac/aacenc_lib.h || die "ERROR: aacenc_lib.h not found"; } + flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" + enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs + enabled fontconfig && enable libfontconfig +diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c +index 677b11088b..d191133ae0 100644 +--- a/libavcodec/libfdk-aacdec.c ++++ b/libavcodec/libfdk-aacdec.c +@@ -17,6 +17,17 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#ifndef _WIN32 ++#include ++#define LIBNAME "libfdk-aac.so.1" ++#else ++#include ++#define LIBNAME "libfdk-aac-1.dll" ++#define dlopen(fname, f) ((void *) LoadLibraryA(fname)) ++#define dlclose(handle) FreeLibrary((HMODULE) handle) ++#define dlsym(handle, name) GetProcAddress((HMODULE) handle, name) ++#endif ++ + #include + + #include "libavutil/channel_layout.h" +@@ -25,6 +36,37 @@ + #include "avcodec.h" + #include "internal.h" + ++typedef LINKSPEC_H HANDLE_AACDECODER (*imp_aacDecoder_Open)(TRANSPORT_TYPE transportFmt, UINT nrOfLayers); ++typedef LINKSPEC_H void (*imp_aacDecoder_Close)(HANDLE_AACDECODER self); ++typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_Fill)(HANDLE_AACDECODER self, UCHAR *pBuffer[], const UINT bufferSize[], UINT *bytesValid); ++typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_DecodeFrame)(HANDLE_AACDECODER self, INT_PCM *pTimeData, const INT timeDataSize, const UINT flags); ++typedef LINKSPEC_H CStreamInfo* (*imp_aacDecoder_GetStreamInfo)(HANDLE_AACDECODER self); ++typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_ConfigRaw)(HANDLE_AACDECODER self, UCHAR *conf[], const UINT length[]); ++typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_SetParam)(const HANDLE_AACDECODER self, const AACDEC_PARAM param, const INT value); ++typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_AncDataInit)(HANDLE_AACDECODER self, UCHAR *buffer, int size); ++ ++typedef struct _aacDecLib { ++ imp_aacDecoder_Open aacDecoder_Open; ++ imp_aacDecoder_Close aacDecoder_Close; ++ imp_aacDecoder_Fill aacDecoder_Fill; ++ imp_aacDecoder_DecodeFrame aacDecoder_DecodeFrame; ++ imp_aacDecoder_ConfigRaw aacDecoder_ConfigRaw; ++ imp_aacDecoder_GetStreamInfo aacDecoder_GetStreamInfo; ++ imp_aacDecoder_SetParam aacDecoder_SetParam; ++ imp_aacDecoder_AncDataInit aacDecoder_AncDataInit; ++} aacDecLib; ++ ++#define DLSYM(x) \ ++ do \ ++ { \ ++ s->pfn.x = ( imp_##x ) dlsym(s->hLib, AV_STRINGIFY(x)); \ ++ if (!s->pfn.x ) \ ++ { \ ++ av_log(avctx, AV_LOG_ERROR, "Unable to find symbol " AV_STRINGIFY(x) " in dynamic " LIBNAME "\n"); \ ++ return -1; \ ++ } \ ++ } while (0) ++ + /* The version macro is introduced the same time as the setting enum was + * changed, so this check should suffice. */ + #ifndef AACDECODER_LIB_VL0 +@@ -41,6 +83,8 @@ enum ConcealMethod { + typedef struct FDKAACDecContext { + const AVClass *class; + HANDLE_AACDECODER handle; ++ void *hLib; ++ aacDecLib pfn; + uint8_t *decoder_buffer; + int decoder_buffer_size; + uint8_t *anc_buffer; +@@ -88,7 +132,7 @@ static const AVClass fdk_aac_dec_class = { + static int get_stream_info(AVCodecContext *avctx) + { + FDKAACDecContext *s = avctx->priv_data; +- CStreamInfo *info = aacDecoder_GetStreamInfo(s->handle); ++ CStreamInfo *info = s->pfn.aacDecoder_GetStreamInfo(s->handle); + int channel_counts[0x24] = { 0 }; + int i, ch_error = 0; + uint64_t ch_layout = 0; +@@ -200,8 +244,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx) + { + FDKAACDecContext *s = avctx->priv_data; + +- if (s->handle) +- aacDecoder_Close(s->handle); ++ if (s->hLib && s->handle) { ++ s->pfn.aacDecoder_Close(s->handle); ++ dlclose(s->hLib); ++ } + av_freep(&s->decoder_buffer); + av_freep(&s->anc_buffer); + +@@ -213,6 +259,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx) + FDKAACDecContext *s = avctx->priv_data; + AAC_DECODER_ERROR err; + ++ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) { ++ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n"); ++ return -1; ++ } ++ ++ DLSYM(aacDecoder_Open); ++#define aacDecoder_Open s->pfn.aacDecoder_Open ++ DLSYM(aacDecoder_Close); ++ DLSYM(aacDecoder_Fill); ++#define aacDecoder_Fill s->pfn.aacDecoder_Fill ++ DLSYM(aacDecoder_DecodeFrame); ++#define aacDecoder_DecodeFrame s->pfn.aacDecoder_DecodeFrame ++ DLSYM(aacDecoder_GetStreamInfo); ++#define aacDecoder_GetStreamInfo s->pfn.aacDecoder_GetStreamInfo ++ DLSYM(aacDecoder_ConfigRaw); ++#define aacDecoder_ConfigRaw s->pfn.aacDecoder_ConfigRaw ++ DLSYM(aacDecoder_SetParam); ++#define aacDecoder_SetParam s->pfn.aacDecoder_SetParam ++ DLSYM(aacDecoder_AncDataInit); ++#define aacDecoder_AncDataInit s->pfn.aacDecoder_AncDataInit ++ + s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1); + if (!s->handle) { + av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n"); +diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c +index d47137b227..6295af3858 100644 +--- a/libavcodec/libfdk-aacenc.c ++++ b/libavcodec/libfdk-aacenc.c +@@ -17,6 +17,17 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#ifndef _WIN32 ++#include ++#define LIBNAME "libfdk-aac.so.1" ++#else ++#include ++#define LIBNAME "libfdk-aac-1.dll" ++#define dlopen(fname, f) ((void *) LoadLibraryA(fname)) ++#define dlclose(handle) FreeLibrary((HMODULE) handle) ++#define dlsym(handle, name) GetProcAddress((HMODULE) handle, name) ++#endif ++ + #include + + #include "libavutil/channel_layout.h" +@@ -26,6 +37,31 @@ + #include "audio_frame_queue.h" + #include "internal.h" + ++typedef AACENC_ERROR (*imp_aacEncOpen)(HANDLE_AACENCODER *phAacEncoder, const UINT encModules, const UINT maxChannels); ++typedef AACENC_ERROR (*imp_aacEncClose)(HANDLE_AACENCODER *phAacEncoder); ++typedef AACENC_ERROR (*imp_aacEncEncode)(const HANDLE_AACENCODER hAacEncoder, const AACENC_BufDesc *inBufDesc, const AACENC_BufDesc *outBufDesc, const AACENC_InArgs *inargs, AACENC_OutArgs *outargs); ++typedef AACENC_ERROR (*imp_aacEncInfo)(const HANDLE_AACENCODER hAacEncoder, AACENC_InfoStruct *pInfo); ++typedef AACENC_ERROR (*imp_aacEncoder_SetParam)(const HANDLE_AACENCODER hAacEncoder, const AACENC_PARAM param, const UINT value); ++ ++typedef struct _aacEncLib { ++ imp_aacEncOpen aacEncOpen; ++ imp_aacEncClose aacEncClose; ++ imp_aacEncEncode aacEncEncode; ++ imp_aacEncInfo aacEncInfo; ++ imp_aacEncoder_SetParam aacEncoder_SetParam; ++} aacEncLib; ++ ++#define DLSYM(x) \ ++ do \ ++ { \ ++ s->pfn.x = ( imp_##x ) dlsym(s->hLib, AV_STRINGIFY(x)); \ ++ if (!s->pfn.x ) \ ++ { \ ++ av_log(avctx, AV_LOG_ERROR, "Unable to find symbol " AV_STRINGIFY(x) " in dynamic " LIBNAME "\n"); \ ++ return -1; \ ++ } \ ++ } while (0) ++ + typedef struct AACContext { + const AVClass *class; + HANDLE_AACENCODER handle; +@@ -36,6 +72,8 @@ typedef struct AACContext { + int header_period; + int vbr; + ++ void *hLib; ++ aacEncLib pfn; + AudioFrameQueue afq; + } AACContext; + +@@ -96,8 +134,10 @@ static int aac_encode_close(AVCodecContext *avctx) + { + AACContext *s = avctx->priv_data; + +- if (s->handle) +- aacEncClose(&s->handle); ++ if (s->hLib && s->handle) { ++ s->pfn.aacEncClose(&s->handle); ++ dlclose(s->hLib); ++ } + av_freep(&avctx->extradata); + ff_af_queue_close(&s->afq); + +@@ -114,6 +154,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) + int aot = FF_PROFILE_AAC_LOW + 1; + int sce = 0, cpe = 0; + ++ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) { ++ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n"); ++ return -1; ++ } ++ ++ DLSYM(aacEncOpen); ++#define aacEncOpen s->pfn.aacEncOpen ++ DLSYM(aacEncClose); ++ DLSYM(aacEncEncode); ++#define aacEncEncode s->pfn.aacEncEncode ++ DLSYM(aacEncInfo); ++#define aacEncInfo s->pfn.aacEncInfo ++ DLSYM(aacEncoder_SetParam); ++#define aacEncoder_SetParam s->pfn.aacEncoder_SetParam ++ + if ((err = aacEncOpen(&s->handle, 0, avctx->channels)) != AACENC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n", + aac_get_error(err)); +-- +2.15.1