Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
6fd110a0
Commit
6fd110a0
authored
Jan 06, 2018
by
Aurelien Jacobs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aptx: implement the aptX HD bluetooth codec
parent
96b217f5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
1 deletion
+17
-1
Changelog
Changelog
+1
-1
configure
configure
+2
-0
general.texi
doc/general.texi
+2
-0
Makefile
libavcodec/Makefile
+2
-0
allcodecs.c
libavcodec/allcodecs.c
+2
-0
aptx.c
libavcodec/aptx.c
+0
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
No files found.
Changelog
View file @
6fd110a0
...
...
@@ -11,7 +11,7 @@ version <next>:
- TiVo ty/ty+ demuxer
- Intel QSV-accelerated MJPEG encoding
- PCE support for extended channel layouts in the AAC encoder
- native aptX encoder and decoder
- native aptX
and aptX HD
encoder and decoder
- Raw aptX muxer and demuxer
- NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-1/2/4, VC1, VP8/9 hwaccel decoding
- Intel QSV-accelerated overlay filter
...
...
configure
View file @
6fd110a0
...
...
@@ -2461,6 +2461,8 @@ apng_encoder_deps="zlib"
apng_encoder_select
=
"llvidencdsp"
aptx_decoder_select
=
"audio_frame_queue"
aptx_encoder_select
=
"audio_frame_queue"
aptx_hd_decoder_select
=
"audio_frame_queue"
aptx_hd_encoder_select
=
"audio_frame_queue"
asv1_decoder_select
=
"blockdsp bswapdsp idctdsp"
asv1_encoder_select
=
"bswapdsp fdctdsp pixblockdsp"
asv2_decoder_select
=
"blockdsp bswapdsp idctdsp"
...
...
doc/general.texi
View file @
6fd110a0
...
...
@@ -1009,6 +1009,8 @@ following image formats are supported:
@tab QuickTime fourcc 'alac'
@item aptX @tab X @tab X
@tab Used in Bluetooth A2DP
@item aptX HD @tab X @tab X
@tab Used in Bluetooth A2DP
@item ATRAC1 @tab @tab X
@item ATRAC3 @tab @tab X
@item ATRAC3+ @tab @tab X
...
...
libavcodec/Makefile
View file @
6fd110a0
...
...
@@ -190,6 +190,8 @@ OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
OBJS-$(CONFIG_APE_DECODER)
+=
apedec.o
OBJS-$(CONFIG_APTX_DECODER)
+=
aptx.o
OBJS-$(CONFIG_APTX_ENCODER)
+=
aptx.o
OBJS-$(CONFIG_APTX_HD_DECODER)
+=
aptx.o
OBJS-$(CONFIG_APTX_HD_ENCODER)
+=
aptx.o
OBJS-$(CONFIG_APNG_DECODER)
+=
png.o
pngdec.o
pngdsp.o
OBJS-$(CONFIG_APNG_ENCODER)
+=
png.o
pngenc.o
OBJS-$(CONFIG_SSA_DECODER)
+=
assdec.o
ass.o
...
...
libavcodec/allcodecs.c
View file @
6fd110a0
...
...
@@ -386,6 +386,8 @@ extern AVCodec ff_amrwb_decoder;
extern
AVCodec
ff_ape_decoder
;
extern
AVCodec
ff_aptx_encoder
;
extern
AVCodec
ff_aptx_decoder
;
extern
AVCodec
ff_aptx_hd_encoder
;
extern
AVCodec
ff_aptx_hd_decoder
;
extern
AVCodec
ff_atrac1_decoder
;
extern
AVCodec
ff_atrac3_decoder
;
extern
AVCodec
ff_atrac3al_decoder
;
...
...
libavcodec/aptx.c
View file @
6fd110a0
This diff is collapsed.
Click to expand it.
libavcodec/avcodec.h
View file @
6fd110a0
...
...
@@ -634,6 +634,7 @@ enum AVCodecID {
AV_CODEC_ID_ATRAC3PAL
,
AV_CODEC_ID_DOLBY_E
,
AV_CODEC_ID_APTX
,
AV_CODEC_ID_APTX_HD
,
/* subtitle codecs */
AV_CODEC_ID_FIRST_SUBTITLE
=
0x17000
,
///< A dummy ID pointing at the start of subtitle codecs.
...
...
libavcodec/codec_desc.c
View file @
6fd110a0
...
...
@@ -2858,6 +2858,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"aptX (Audio Processing Technology for Bluetooth)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
{
.
id
=
AV_CODEC_ID_APTX_HD
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"aptx_hd"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"aptX HD (Audio Processing Technology for Bluetooth)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
/* subtitle codecs */
{
...
...
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