Commit 6fd110a0 authored by Aurelien Jacobs's avatar Aurelien Jacobs

aptx: implement the aptX HD bluetooth codec

parent 96b217f5
...@@ -11,7 +11,7 @@ version <next>: ...@@ -11,7 +11,7 @@ version <next>:
- TiVo ty/ty+ demuxer - TiVo ty/ty+ demuxer
- Intel QSV-accelerated MJPEG encoding - Intel QSV-accelerated MJPEG encoding
- PCE support for extended channel layouts in the AAC encoder - 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 - Raw aptX muxer and demuxer
- NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-1/2/4, VC1, VP8/9 hwaccel decoding - NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-1/2/4, VC1, VP8/9 hwaccel decoding
- Intel QSV-accelerated overlay filter - Intel QSV-accelerated overlay filter
......
...@@ -2461,6 +2461,8 @@ apng_encoder_deps="zlib" ...@@ -2461,6 +2461,8 @@ apng_encoder_deps="zlib"
apng_encoder_select="llvidencdsp" apng_encoder_select="llvidencdsp"
aptx_decoder_select="audio_frame_queue" aptx_decoder_select="audio_frame_queue"
aptx_encoder_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_decoder_select="blockdsp bswapdsp idctdsp"
asv1_encoder_select="bswapdsp fdctdsp pixblockdsp" asv1_encoder_select="bswapdsp fdctdsp pixblockdsp"
asv2_decoder_select="blockdsp bswapdsp idctdsp" asv2_decoder_select="blockdsp bswapdsp idctdsp"
......
...@@ -1009,6 +1009,8 @@ following image formats are supported: ...@@ -1009,6 +1009,8 @@ following image formats are supported:
@tab QuickTime fourcc 'alac' @tab QuickTime fourcc 'alac'
@item aptX @tab X @tab X @item aptX @tab X @tab X
@tab Used in Bluetooth A2DP @tab Used in Bluetooth A2DP
@item aptX HD @tab X @tab X
@tab Used in Bluetooth A2DP
@item ATRAC1 @tab @tab X @item ATRAC1 @tab @tab X
@item ATRAC3 @tab @tab X @item ATRAC3 @tab @tab X
@item ATRAC3+ @tab @tab X @item ATRAC3+ @tab @tab X
......
...@@ -190,6 +190,8 @@ OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o ...@@ -190,6 +190,8 @@ OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_APE_DECODER) += apedec.o
OBJS-$(CONFIG_APTX_DECODER) += aptx.o OBJS-$(CONFIG_APTX_DECODER) += aptx.o
OBJS-$(CONFIG_APTX_ENCODER) += 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_DECODER) += png.o pngdec.o pngdsp.o
OBJS-$(CONFIG_APNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_APNG_ENCODER) += png.o pngenc.o
OBJS-$(CONFIG_SSA_DECODER) += assdec.o ass.o OBJS-$(CONFIG_SSA_DECODER) += assdec.o ass.o
......
...@@ -386,6 +386,8 @@ extern AVCodec ff_amrwb_decoder; ...@@ -386,6 +386,8 @@ extern AVCodec ff_amrwb_decoder;
extern AVCodec ff_ape_decoder; extern AVCodec ff_ape_decoder;
extern AVCodec ff_aptx_encoder; extern AVCodec ff_aptx_encoder;
extern AVCodec ff_aptx_decoder; 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_atrac1_decoder;
extern AVCodec ff_atrac3_decoder; extern AVCodec ff_atrac3_decoder;
extern AVCodec ff_atrac3al_decoder; extern AVCodec ff_atrac3al_decoder;
......
This diff is collapsed.
...@@ -634,6 +634,7 @@ enum AVCodecID { ...@@ -634,6 +634,7 @@ enum AVCodecID {
AV_CODEC_ID_ATRAC3PAL, AV_CODEC_ID_ATRAC3PAL,
AV_CODEC_ID_DOLBY_E, AV_CODEC_ID_DOLBY_E,
AV_CODEC_ID_APTX, AV_CODEC_ID_APTX,
AV_CODEC_ID_APTX_HD,
/* subtitle codecs */ /* subtitle codecs */
AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
......
...@@ -2858,6 +2858,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -2858,6 +2858,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("aptX (Audio Processing Technology for Bluetooth)"), .long_name = NULL_IF_CONFIG_SMALL("aptX (Audio Processing Technology for Bluetooth)"),
.props = AV_CODEC_PROP_LOSSY, .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 */ /* subtitle codecs */
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment