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
fa42575f
Commit
fa42575f
authored
Jan 25, 2023
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add XMD demuxer
parent
280e6e93
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
84 additions
and
2 deletions
+84
-2
Changelog
Changelog
+1
-1
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
version.h
libavformat/version.h
+1
-1
xmd.c
libavformat/xmd.c
+80
-0
No files found.
Changelog
View file @
fa42575f
...
...
@@ -34,7 +34,7 @@ version <next>:
- ssim360 video filter
- ffmpeg CLI new options: -enc_stats_pre[_fmt], -enc_stats_post[_fmt]
- hstack_vaapi, vstack_vaapi and xstack_vaapi filters
- XMD ADPCM decoder
- XMD ADPCM decoder
and demuxer
version 5.1:
...
...
libavformat/Makefile
View file @
fa42575f
...
...
@@ -621,6 +621,7 @@ OBJS-$(CONFIG_WVE_DEMUXER) += wvedec.o pcm.o
OBJS-$(CONFIG_WV_MUXER)
+=
wvenc.o
wv.o
apetag.o
img2.o
OBJS-$(CONFIG_XA_DEMUXER)
+=
xa.o
OBJS-$(CONFIG_XBIN_DEMUXER)
+=
bintext.o
sauce.o
OBJS-$(CONFIG_XMD_DEMUXER)
+=
xmd.o
pcm.o
OBJS-$(CONFIG_XMV_DEMUXER)
+=
xmv.o
OBJS-$(CONFIG_XVAG_DEMUXER)
+=
xvag.o
OBJS-$(CONFIG_XWMA_DEMUXER)
+=
xwma.o
...
...
libavformat/allformats.c
View file @
fa42575f
...
...
@@ -501,6 +501,7 @@ extern const AVInputFormat ff_wv_demuxer;
extern
const
AVOutputFormat
ff_wv_muxer
;
extern
const
AVInputFormat
ff_xa_demuxer
;
extern
const
AVInputFormat
ff_xbin_demuxer
;
extern
const
AVInputFormat
ff_xmd_demuxer
;
extern
const
AVInputFormat
ff_xmv_demuxer
;
extern
const
AVInputFormat
ff_xvag_demuxer
;
extern
const
AVInputFormat
ff_xwma_demuxer
;
...
...
libavformat/version.h
View file @
fa42575f
...
...
@@ -31,7 +31,7 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 3
6
#define LIBAVFORMAT_VERSION_MINOR 3
7
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
libavformat/xmd.c
0 → 100644
View file @
fa42575f
/*
* XMD 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"
#include "pcm.h"
static
int
xmd_probe
(
const
AVProbeData
*
p
)
{
if
((
AV_RL32
(
p
->
buf
)
&
0xFFFFFF
)
!=
MKTAG
(
'x'
,
'm'
,
'd'
,
0
))
return
0
;
if
(
p
->
buf
[
3
]
==
0
||
p
->
buf
[
3
]
>
2
||
AV_RL16
(
p
->
buf
+
4
)
==
0
||
AV_RL32
(
p
->
buf
+
6
)
==
0
)
return
0
;
return
AVPROBE_SCORE_MAX
/
3
;
}
static
int
xmd_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
AVCodecParameters
*
par
;
int
channels
;
AVStream
*
st
;
avio_skip
(
pb
,
3
);
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_ADPCM_XMD
;
channels
=
avio_r8
(
pb
);
if
(
channels
==
0
)
return
AVERROR_INVALIDDATA
;
av_channel_layout_default
(
&
par
->
ch_layout
,
channels
);
par
->
sample_rate
=
avio_rl16
(
pb
);
if
(
par
->
sample_rate
<=
0
)
return
AVERROR_INVALIDDATA
;
par
->
block_align
=
21
*
channels
;
st
->
duration
=
(
avio_rl32
(
pb
)
/
par
->
block_align
)
*
32LL
;
avpriv_set_pts_info
(
st
,
64
,
1
,
par
->
sample_rate
);
avio_skip
(
pb
,
7
);
return
0
;
}
const
AVInputFormat
ff_xmd_demuxer
=
{
.
name
=
"xmd"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Konami XMD"
),
.
read_probe
=
xmd_probe
,
.
read_header
=
xmd_read_header
,
.
read_packet
=
ff_pcm_read_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"xmd"
,
};
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