Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
fba45461
Commit
fba45461
authored
Jun 27, 2023
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add OSQ demuxer
parent
7ef9d310
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
123 additions
and
2 deletions
+123
-2
Changelog
Changelog
+1
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
osq.c
libavformat/osq.c
+118
-0
version.h
libavformat/version.h
+2
-2
No files found.
Changelog
View file @
fba45461
...
...
@@ -30,6 +30,7 @@ version <next>:
- support for the P_SKIP hinting to speed up libx264 encoding
- Support HEVC,VP9,AV1 codec in enhanced flv format
- apsnr and asisdr audio filters
- OSQ demuxer and decoder
version 6.0:
...
...
libavformat/Makefile
View file @
fba45461
...
...
@@ -433,6 +433,7 @@ OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o
OBJS-$(CONFIG_OMA_MUXER)
+=
omaenc.o
rawenc.o
oma.o
id3v2enc.o
OBJS-$(CONFIG_OPUS_MUXER)
+=
oggenc.o
\
vorbiscomment.o
OBJS-$(CONFIG_OSQ_DEMUXER)
+=
osq.o
rawdec.o
OBJS-$(CONFIG_PAF_DEMUXER)
+=
paf.o
OBJS-$(CONFIG_PCM_ALAW_DEMUXER)
+=
pcmdec.o
pcm.o
OBJS-$(CONFIG_PCM_ALAW_MUXER)
+=
pcmenc.o
rawenc.o
...
...
libavformat/allformats.c
View file @
fba45461
...
...
@@ -331,6 +331,7 @@ extern const FFOutputFormat ff_ogv_muxer;
extern
const
AVInputFormat
ff_oma_demuxer
;
extern
const
FFOutputFormat
ff_oma_muxer
;
extern
const
FFOutputFormat
ff_opus_muxer
;
extern
const
AVInputFormat
ff_osq_demuxer
;
extern
const
AVInputFormat
ff_paf_demuxer
;
extern
const
AVInputFormat
ff_pcm_alaw_demuxer
;
extern
const
FFOutputFormat
ff_pcm_alaw_muxer
;
...
...
libavformat/osq.c
0 → 100644
View file @
fba45461
/*
* OSQ demuxer
* Copyright (c) 2023 Paul B Mahol
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/intreadwrite.h"
#include "avio_internal.h"
#include "avformat.h"
#include "demux.h"
#include "internal.h"
#include "rawdec.h"
static
int
osq_probe
(
const
AVProbeData
*
p
)
{
if
(
AV_RL32
(
p
->
buf
)
!=
MKTAG
(
'O'
,
'S'
,
'Q'
,
' '
))
return
0
;
if
(
AV_RL32
(
p
->
buf
+
4
)
!=
48
)
return
0
;
if
(
AV_RL16
(
p
->
buf
+
8
)
!=
1
)
return
0
;
if
(
p
->
buf
[
10
]
==
0
)
return
0
;
if
(
p
->
buf
[
11
]
==
0
)
return
0
;
if
(
AV_RL32
(
p
->
buf
+
12
)
==
0
)
return
0
;
if
(
AV_RL16
(
p
->
buf
+
16
)
==
0
)
return
0
;
return
AVPROBE_SCORE_MAX
;
}
static
int
osq_read_header
(
AVFormatContext
*
s
)
{
uint32_t
t
,
size
;
AVStream
*
st
;
int
ret
;
t
=
avio_rl32
(
s
->
pb
);
if
(
t
!=
MKTAG
(
'O'
,
'S'
,
'Q'
,
' '
))
return
AVERROR_INVALIDDATA
;
size
=
avio_rl32
(
s
->
pb
);
if
(
size
!=
48
)
return
AVERROR_INVALIDDATA
;
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
if
((
ret
=
ff_get_extradata
(
s
,
st
->
codecpar
,
s
->
pb
,
size
))
<
0
)
return
ret
;
t
=
avio_rl32
(
s
->
pb
);
if
(
t
!=
MKTAG
(
'R'
,
'I'
,
'F'
,
'F'
))
return
AVERROR_INVALIDDATA
;
avio_skip
(
s
->
pb
,
8
);
t
=
avio_rl32
(
s
->
pb
);
if
(
t
!=
MKTAG
(
'f'
,
'm'
,
't'
,
' '
))
return
AVERROR_INVALIDDATA
;
size
=
avio_rl32
(
s
->
pb
);
avio_skip
(
s
->
pb
,
size
);
t
=
avio_rl32
(
s
->
pb
);
size
=
avio_rl32
(
s
->
pb
);
while
(
t
!=
MKTAG
(
'd'
,
'a'
,
't'
,
'a'
))
{
avio_skip
(
s
->
pb
,
size
);
t
=
avio_rl32
(
s
->
pb
);
size
=
avio_rl32
(
s
->
pb
);
if
(
avio_feof
(
s
->
pb
))
return
AVERROR_INVALIDDATA
;
}
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_OSQ
;
st
->
codecpar
->
sample_rate
=
AV_RL32
(
st
->
codecpar
->
extradata
+
4
);
if
(
st
->
codecpar
->
sample_rate
<=
0
)
return
AVERROR_INVALIDDATA
;
st
->
codecpar
->
ch_layout
.
order
=
AV_CHANNEL_ORDER_UNSPEC
;
st
->
codecpar
->
ch_layout
.
nb_channels
=
st
->
codecpar
->
extradata
[
3
];
if
(
st
->
codecpar
->
ch_layout
.
nb_channels
==
0
)
return
AVERROR_INVALIDDATA
;
st
->
start_time
=
0
;
st
->
duration
=
AV_RL32
(
st
->
codecpar
->
extradata
+
16
);
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codecpar
->
sample_rate
);
return
0
;
}
const
AVInputFormat
ff_osq_demuxer
=
{
.
name
=
"osq"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw OSQ"
),
.
read_probe
=
osq_probe
,
.
read_header
=
osq_read_header
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
extensions
=
"osq"
,
.
flags
=
AVFMT_NOBINSEARCH
|
AVFMT_NOGENSEARCH
|
AVFMT_NO_BYTE_SEEK
|
AVFMT_NOTIMESTAMPS
,
.
raw_codec_id
=
AV_CODEC_ID_OSQ
,
.
priv_data_size
=
sizeof
(
FFRawDemuxerContext
),
.
priv_class
=
&
ff_raw_demuxer_class
,
};
libavformat/version.h
View file @
fba45461
...
...
@@ -31,8 +31,8 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 1
0
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_MINOR 1
1
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_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