Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d5d32805
Commit
d5d32805
authored
Feb 19, 2016
by
Rodger Combs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add AudioToolbox decoders
Part of trac #4828
parent
db1a642c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
389 additions
and
2 deletions
+389
-2
Changelog
Changelog
+1
-0
configure
configure
+24
-0
Makefile
libavcodec/Makefile
+14
-0
allcodecs.c
libavcodec/allcodecs.c
+14
-0
audiotoolboxdec.c
libavcodec/audiotoolboxdec.c
+334
-0
version.h
libavcodec/version.h
+2
-2
No files found.
Changelog
View file @
d5d32805
...
...
@@ -13,6 +13,7 @@ version <next>:
- protocol blacklisting API
- MediaCodec H264 decoding
- VC-2 HQ RTP payload format (draft v1) depacketizer
- AudioToolbox audio decoders
version 3.0:
...
...
configure
View file @
d5d32805
...
...
@@ -194,6 +194,7 @@ Individual component options:
--disable-filters disable all filters
External library support:
--disable-audiotoolbox enable AudioToolbox decoders and encoders [autodetect]
--enable-avisynth enable reading of AviSynth script files [no]
--disable-bzlib disable bzlib [autodetect]
--enable-cuda enable dynamically linked CUDA [no]
...
...
@@ -1446,6 +1447,7 @@ EXAMPLE_LIST="
"
EXTERNAL_LIBRARY_LIST
=
"
audiotoolbox
avisynth
bzlib
chromaprint
...
...
@@ -2506,6 +2508,10 @@ zlib_encoder_select="zlib"
zmbv_decoder_select
=
"zlib"
zmbv_encoder_select
=
"zlib"
# platform codecs
audiotoolbox_deps
=
"AudioToolbox_AudioToolbox_h"
audiotoolbox_extralibs
=
"-framework CoreFoundation -framework AudioToolbox -framework CoreMedia"
# hardware accelerators
crystalhd_deps
=
"libcrystalhd_libcrystalhd_if_h"
d3d11va_deps
=
"d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
...
...
@@ -2641,6 +2647,20 @@ vc1_parser_select="vc1dsp"
mjpeg2jpeg_bsf_select
=
"jpegtables"
# external libraries
aac_at_decoder_deps
=
"audiotoolbox"
ac3_at_decoder_deps
=
"audiotoolbox"
adpcm_ima_qt_at_decoder_deps
=
"audiotoolbox"
alac_at_decoder_deps
=
"audiotoolbox"
amr_nb_at_decoder_deps
=
"audiotoolbox"
gsm_ms_at_decoder_deps
=
"audiotoolbox"
ilbc_at_decoder_deps
=
"audiotoolbox"
mp1_at_decoder_deps
=
"audiotoolbox"
mp2_at_decoder_deps
=
"audiotoolbox"
mp3_at_decoder_deps
=
"audiotoolbox"
pcm_alaw_at_decoder_deps
=
"audiotoolbox"
pcm_mulaw_at_decoder_deps
=
"audiotoolbox"
qdmc_at_decoder_deps
=
"audiotoolbox"
qdm2_at_decoder_deps
=
"audiotoolbox"
chromaprint_muxer_deps
=
"chromaprint"
h264_videotoolbox_encoder_deps
=
"videotoolbox_encoder pthreads"
libcelt_decoder_deps
=
"libcelt"
...
...
@@ -3087,6 +3107,9 @@ enable valgrind_backtrace
sws_max_filter_size_default
=
256
set_default sws_max_filter_size
# Enable platform codecs by default.
enable
audiotoolbox
# Enable hwaccels by default.
enable
d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
enable
xlib
...
...
@@ -5365,6 +5388,7 @@ check_func_headers glob.h glob
enabled xlib
&&
check_func_headers
"X11/Xlib.h X11/extensions/Xvlib.h"
XvGetPortAttribute
-lXv
-lX11
-lXext
check_header AudioToolbox/AudioToolbox.h
check_header direct.h
check_header dirent.h
check_header dlfcn.h
...
...
libavcodec/Makefile
View file @
d5d32805
...
...
@@ -801,6 +801,20 @@ OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o mpegaudiodata.o \
OBJS-$(CONFIG_ELBG_FILTER)
+=
elbg.o
# external codec libraries
OBJS-$(CONFIG_AAC_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_AC3_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_ADPCM_IMA_QT_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_ALAC_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_AMR_NB_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_GSM_MS_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_ILBC_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_MP1_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_MP2_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_MP3_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_PCM_MULAW_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_PCM_ALAW_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_QDMC_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_QDM2_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_LIBCELT_DECODER)
+=
libcelt_dec.o
OBJS-$(CONFIG_LIBDCADEC_DECODER)
+=
libdcadec.o
dca.o
OBJS-$(CONFIG_LIBFAAC_ENCODER)
+=
libfaac.o
...
...
libavcodec/allcodecs.c
View file @
d5d32805
...
...
@@ -563,6 +563,20 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
XSUB
,
xsub
);
/* external libraries */
REGISTER_DECODER
(
AAC_AT
,
aac_at
);
REGISTER_DECODER
(
AC3_AT
,
ac3_at
);
REGISTER_DECODER
(
ADPCM_IMA_QT_AT
,
adpcm_ima_qt_at
);
REGISTER_DECODER
(
ALAC_AT
,
alac_at
);
REGISTER_DECODER
(
AMR_NB_AT
,
amr_nb_at
);
REGISTER_DECODER
(
GSM_MS_AT
,
gsm_ms_at
);
REGISTER_DECODER
(
ILBC_AT
,
ilbc_at
);
REGISTER_DECODER
(
MP1_AT
,
mp1_at
);
REGISTER_DECODER
(
MP2_AT
,
mp2_at
);
REGISTER_DECODER
(
MP3_AT
,
mp3_at
);
REGISTER_DECODER
(
PCM_ALAW_AT
,
pcm_alaw_at
);
REGISTER_DECODER
(
PCM_MULAW_AT
,
pcm_mulaw_at
);
REGISTER_DECODER
(
QDMC_AT
,
qdmc_at
);
REGISTER_DECODER
(
QDM2_AT
,
qdm2_at
);
REGISTER_DECODER
(
LIBCELT
,
libcelt
);
REGISTER_DECODER
(
LIBDCADEC
,
libdcadec
)
REGISTER_ENCODER
(
LIBFAAC
,
libfaac
);
...
...
libavcodec/audiotoolboxdec.c
0 → 100644
View file @
d5d32805
This diff is collapsed.
Click to expand it.
libavcodec/version.h
View file @
d5d32805
...
...
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 2
8
#define LIBAVCODEC_VERSION_MICRO 10
3
#define LIBAVCODEC_VERSION_MINOR 2
9
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment