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
385ec464
Commit
385ec464
authored
Jan 27, 2023
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add SDNS demuxer
parent
72532867
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
101 additions
and
1 deletion
+101
-1
Changelog
Changelog
+1
-0
general_contents.texi
doc/general_contents.texi
+1
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
sdns.c
libavformat/sdns.c
+96
-0
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
385ec464
...
...
@@ -40,6 +40,7 @@ version <next>:
- ffmpeg CLI new option: -fix_sub_duration_heartbeat
- WavArc decoder and demuxer
- CrystalHD decoders deprecated
- SDNS demuxer
version 5.1:
...
...
doc/general_contents.texi
View file @
385ec464
...
...
@@ -665,6 +665,7 @@ library:
@item Sample Dump eXchange @tab @tab X
@item SAP @tab X @tab X
@item SBG @tab @tab X
@item SDNS @tab @tab X
@item SDP @tab @tab X
@item SER @tab @tab X
@item Digital Pictures SGA @tab @tab X
...
...
libavformat/Makefile
View file @
385ec464
...
...
@@ -523,6 +523,7 @@ OBJS-$(CONFIG_SBG_DEMUXER) += sbgdec.o
OBJS-$(CONFIG_SCC_DEMUXER)
+=
sccdec.o
subtitles.o
OBJS-$(CONFIG_SCC_MUXER)
+=
sccenc.o
OBJS-$(CONFIG_SCD_DEMUXER)
+=
scd.o
OBJS-$(CONFIG_SDNS_DEMUXER)
+=
sdns.o
OBJS-$(CONFIG_SDP_DEMUXER)
+=
rtsp.o
OBJS-$(CONFIG_SDR2_DEMUXER)
+=
sdr2.o
OBJS-$(CONFIG_SDS_DEMUXER)
+=
sdsdec.o
...
...
libavformat/allformats.c
View file @
385ec464
...
...
@@ -405,6 +405,7 @@ extern const AVInputFormat ff_sbg_demuxer;
extern
const
AVInputFormat
ff_scc_demuxer
;
extern
const
FFOutputFormat
ff_scc_muxer
;
extern
const
AVInputFormat
ff_scd_demuxer
;
extern
const
AVInputFormat
ff_sdns_demuxer
;
extern
const
AVInputFormat
ff_sdp_demuxer
;
extern
const
AVInputFormat
ff_sdr2_demuxer
;
extern
const
AVInputFormat
ff_sds_demuxer
;
...
...
libavformat/sdns.c
0 → 100644
View file @
385ec464
/*
* SDNS 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/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "demux.h"
#include "internal.h"
static
int
sdns_probe
(
const
AVProbeData
*
p
)
{
if
(
AV_RL32
(
p
->
buf
)
!=
MKTAG
(
'S'
,
'D'
,
'N'
,
'S'
))
return
0
;
if
(
AV_RB32
(
p
->
buf
+
8
)
<=
0
)
return
0
;
if
(
AV_RB32
(
p
->
buf
+
12
)
<=
0
||
AV_RB32
(
p
->
buf
+
12
)
>
128
)
return
0
;
return
AVPROBE_SCORE_MAX
/
3
;
}
static
int
sdns_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
AVCodecParameters
*
par
;
int
channels
,
ret
;
AVStream
*
st
;
avio_skip
(
pb
,
8
);
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
par
=
st
->
codecpar
;
par
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
par
->
codec_id
=
AV_CODEC_ID_XMA1
;
par
->
sample_rate
=
avio_rb32
(
pb
);
channels
=
avio_rb32
(
pb
);
if
(
channels
<=
0
||
channels
>
128
)
return
AVERROR_INVALIDDATA
;
av_channel_layout_default
(
&
par
->
ch_layout
,
channels
);
if
(
par
->
sample_rate
<=
0
)
return
AVERROR_INVALIDDATA
;
par
->
block_align
=
2048
;
if
((
ret
=
ff_alloc_extradata
(
par
,
8
+
20
*
((
channels
+
1
)
/
2
)))
<
0
)
return
ret
;
memset
(
par
->
extradata
,
0
,
28
);
par
->
extradata
[
4
]
=
(
channels
+
1
)
/
2
;
for
(
int
i
=
0
;
i
<
par
->
extradata
[
4
];
i
++
)
par
->
extradata
[
8
+
20
*
i
+
17
]
=
FFMIN
(
2
,
channels
-
i
*
2
);
avpriv_set_pts_info
(
st
,
64
,
1
,
par
->
sample_rate
);
avio_seek
(
pb
,
0x1000
,
SEEK_SET
);
return
0
;
}
static
int
sdns_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
int
ret
;
if
(
avio_feof
(
s
->
pb
))
return
AVERROR_EOF
;
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
2048
);
pkt
->
stream_index
=
0
;
return
ret
;
}
const
AVInputFormat
ff_sdns_demuxer
=
{
.
name
=
"sdns"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Xbox SDNS"
),
.
read_probe
=
sdns_probe
,
.
read_header
=
sdns_read_header
,
.
read_packet
=
sdns_read_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"sdns"
,
};
libavformat/version.h
View file @
385ec464
...
...
@@ -31,7 +31,7 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR
0
#define LIBAVFORMAT_VERSION_MINOR
1
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
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