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
d8258489
Commit
d8258489
authored
Jan 06, 2018
by
Aurelien Jacobs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aptx: add raw muxer and demuxer for aptX HD
parent
6fd110a0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
5 deletions
+73
-5
Changelog
Changelog
+1
-1
general.texi
doc/general.texi
+1
-0
Makefile
libavformat/Makefile
+2
-0
allformats.c
libavformat/allformats.c
+2
-0
aptxdec.c
libavformat/aptxdec.c
+54
-4
rawenc.c
libavformat/rawenc.c
+13
-0
No files found.
Changelog
View file @
d8258489
...
...
@@ -12,7 +12,7 @@ version <next>:
- Intel QSV-accelerated MJPEG encoding
- PCE support for extended channel layouts in the AAC encoder
- native aptX and aptX HD encoder and decoder
- Raw aptX muxer and demuxer
- Raw aptX
and aptX HD
muxer and demuxer
- NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-1/2/4, VC1, VP8/9 hwaccel decoding
- Intel QSV-accelerated overlay filter
- mcompand audio filter
...
...
doc/general.texi
View file @
d8258489
...
...
@@ -455,6 +455,7 @@ library:
@item raw AMR-NB @tab @tab X
@item raw AMR-WB @tab @tab X
@item raw aptX @tab X @tab X
@item raw aptX HD @tab X @tab X
@item raw Chinese AVS video @tab X @tab X
@item raw CRI ADX @tab X @tab X
@item raw Dirac @tab X @tab X
...
...
libavformat/Makefile
View file @
d8258489
...
...
@@ -96,6 +96,8 @@ OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o
OBJS-$(CONFIG_APNG_MUXER)
+=
apngenc.o
OBJS-$(CONFIG_APTX_DEMUXER)
+=
aptxdec.o
rawdec.o
OBJS-$(CONFIG_APTX_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_APTX_HD_DEMUXER)
+=
aptxdec.o
rawdec.o
OBJS-$(CONFIG_APTX_HD_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_AQTITLE_DEMUXER)
+=
aqtitledec.o
subtitles.o
OBJS-$(CONFIG_ASF_DEMUXER)
+=
asfdec_f.o
asf.o
asfcrypt.o
\
avlanguage.o
...
...
libavformat/allformats.c
View file @
d8258489
...
...
@@ -59,6 +59,8 @@ extern AVInputFormat ff_apng_demuxer;
extern
AVOutputFormat
ff_apng_muxer
;
extern
AVInputFormat
ff_aptx_demuxer
;
extern
AVOutputFormat
ff_aptx_muxer
;
extern
AVInputFormat
ff_aptx_hd_demuxer
;
extern
AVOutputFormat
ff_aptx_hd_muxer
;
extern
AVInputFormat
ff_aqtitle_demuxer
;
extern
AVInputFormat
ff_asf_demuxer
;
extern
AVOutputFormat
ff_asf_muxer
;
...
...
libavformat/aptxdec.c
View file @
d8258489
...
...
@@ -26,26 +26,49 @@
#define APTX_BLOCK_SIZE 4
#define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE)
#define APTX_HD_BLOCK_SIZE 6
#define APTX_HD_PACKET_SIZE (256*APTX_HD_BLOCK_SIZE)
typedef
struct
AptXDemuxerContext
{
AVClass
*
class
;
int
sample_rate
;
}
AptXDemuxerContext
;
static
int
aptx_read_header
(
AVFormatContext
*
s
)
static
AVStream
*
aptx_read_header_common
(
AVFormatContext
*
s
)
{
AptXDemuxerContext
*
s1
=
s
->
priv_data
;
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
)
;
return
NULL
;
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_APTX
;
st
->
codecpar
->
format
=
AV_SAMPLE_FMT_S32P
;
st
->
codecpar
->
channels
=
2
;
st
->
codecpar
->
sample_rate
=
s1
->
sample_rate
;
st
->
start_time
=
0
;
return
st
;
}
static
int
aptx_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
=
aptx_read_header_common
(
s
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_APTX
;
st
->
codecpar
->
bits_per_coded_sample
=
4
;
st
->
codecpar
->
block_align
=
APTX_BLOCK_SIZE
;
st
->
codecpar
->
frame_size
=
APTX_PACKET_SIZE
;
st
->
start_time
=
0
;
return
0
;
}
static
int
aptx_hd_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
=
aptx_read_header_common
(
s
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_APTX_HD
;
st
->
codecpar
->
bits_per_coded_sample
=
6
;
st
->
codecpar
->
block_align
=
APTX_HD_BLOCK_SIZE
;
st
->
codecpar
->
frame_size
=
APTX_HD_PACKET_SIZE
;
return
0
;
}
...
...
@@ -54,11 +77,17 @@ static int aptx_read_packet(AVFormatContext *s, AVPacket *pkt)
return
av_get_packet
(
s
->
pb
,
pkt
,
APTX_PACKET_SIZE
);
}
static
int
aptx_hd_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
return
av_get_packet
(
s
->
pb
,
pkt
,
APTX_HD_PACKET_SIZE
);
}
static
const
AVOption
aptx_options
[]
=
{
{
"sample_rate"
,
""
,
offsetof
(
AptXDemuxerContext
,
sample_rate
),
AV_OPT_TYPE_INT
,
{.
i64
=
48000
},
0
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
NULL
},
};
#if CONFIG_APTX_MUXER
static
const
AVClass
aptx_demuxer_class
=
{
.
class_name
=
"aptx demuxer"
,
.
item_name
=
av_default_item_name
,
...
...
@@ -76,3 +105,24 @@ AVInputFormat ff_aptx_demuxer = {
.
flags
=
AVFMT_GENERIC_INDEX
,
.
priv_class
=
&
aptx_demuxer_class
,
};
#endif
#if CONFIG_APTX_HD_DEMUXER
static
const
AVClass
aptx_hd_demuxer_class
=
{
.
class_name
=
"aptx hd demuxer"
,
.
item_name
=
av_default_item_name
,
.
option
=
aptx_options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVInputFormat
ff_aptx_hd_demuxer
=
{
.
name
=
"aptx_hd"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw aptX HD"
),
.
extensions
=
"aptxhd"
,
.
priv_data_size
=
sizeof
(
AptXDemuxerContext
),
.
read_header
=
aptx_hd_read_header
,
.
read_packet
=
aptx_hd_read_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
priv_class
=
&
aptx_hd_demuxer_class
,
};
#endif
libavformat/rawenc.c
View file @
d8258489
...
...
@@ -104,6 +104,19 @@ AVOutputFormat ff_aptx_muxer = {
};
#endif
#if CONFIG_APTX_HD_MUXER
AVOutputFormat
ff_aptx_hd_muxer
=
{
.
name
=
"aptx_hd"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw aptX HD (Audio Processing Technology for Bluetooth)"
),
.
extensions
=
"aptxhd"
,
.
audio_codec
=
AV_CODEC_ID_APTX_HD
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
force_one_stream
,
.
write_packet
=
ff_raw_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
#endif
#if CONFIG_CAVSVIDEO_MUXER
AVOutputFormat
ff_cavsvideo_muxer
=
{
.
name
=
"cavsvideo"
,
...
...
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