Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
48f0d3ac
Commit
48f0d3ac
authored
Oct 28, 2015
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add DC STR demuxer
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
af3f793f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
86 additions
and
2 deletions
+86
-2
Changelog
Changelog
+1
-1
general.texi
doc/general.texi
+1
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
dcstr.c
libavformat/dcstr.c
+81
-0
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
48f0d3ac
...
...
@@ -20,7 +20,7 @@ version <next>:
- selectivecolor filter
- extensive native AAC encoder improvements
- ADPCM PSX decoder
- 3dostr, genh, vag, xvag, ads, msf & svag demuxer
- 3dostr,
dcstr,
genh, vag, xvag, ads, msf & svag demuxer
- zscale filter
- wve demuxer
- zero-copy Intel QSV transcoding in ffmpeg
...
...
doc/general.texi
View file @
48f0d3ac
...
...
@@ -299,6 +299,7 @@ library:
@tab Audio format used in some games by CRYO Interactive Entertainment.
@item D-Cinema audio @tab X @tab X
@item Deluxe Paint Animation @tab @tab X
@item DCSTR @tab @tab X
@item DFA @tab @tab X
@tab This format is used in Chronomaster game
@item DirectDraw Surface @tab @tab X
...
...
libavformat/Makefile
View file @
48f0d3ac
...
...
@@ -127,6 +127,7 @@ OBJS-$(CONFIG_DATA_MUXER) += rawdec.o
OBJS-$(CONFIG_DASH_MUXER)
+=
dashenc.o
isom.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
dauddec.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daudenc.o
OBJS-$(CONFIG_DCSTR_DEMUXER)
+=
dcstr.o
OBJS-$(CONFIG_DFA_DEMUXER)
+=
dfa.o
OBJS-$(CONFIG_DIRAC_DEMUXER)
+=
diracdec.o
rawdec.o
OBJS-$(CONFIG_DIRAC_MUXER)
+=
rawenc.o
...
...
libavformat/allformats.c
View file @
48f0d3ac
...
...
@@ -109,6 +109,7 @@ void av_register_all(void)
REGISTER_MUXER
(
DASH
,
dash
);
REGISTER_MUXDEMUX
(
DATA
,
data
);
REGISTER_MUXDEMUX
(
DAUD
,
daud
);
REGISTER_DEMUXER
(
DCSTR
,
dcstr
);
REGISTER_DEMUXER
(
DFA
,
dfa
);
REGISTER_MUXDEMUX
(
DIRAC
,
dirac
);
REGISTER_MUXDEMUX
(
DNXHD
,
dnxhd
);
...
...
libavformat/dcstr.c
0 → 100644
View file @
48f0d3ac
/*
* DC STR demuxer
* Copyright (c) 2015 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 "avformat.h"
#include "internal.h"
static
int
dcstr_probe
(
AVProbeData
*
p
)
{
if
(
p
->
buf_size
<
224
||
memcmp
(
p
->
buf
+
213
,
"Sega Stream"
,
11
))
return
0
;
return
AVPROBE_SCORE_MAX
;
}
static
int
dcstr_read_header
(
AVFormatContext
*
s
)
{
unsigned
codec
,
align
;
AVStream
*
st
;
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
channels
=
avio_rl32
(
s
->
pb
);
st
->
codec
->
sample_rate
=
avio_rl32
(
s
->
pb
);
codec
=
avio_rl32
(
s
->
pb
);
align
=
avio_rl32
(
s
->
pb
);
avio_skip
(
s
->
pb
,
4
);
st
->
duration
=
avio_rl32
(
s
->
pb
);
st
->
codec
->
channels
*=
avio_rl32
(
s
->
pb
);
if
(
!
align
||
align
>
INT_MAX
/
st
->
codec
->
channels
)
return
AVERROR_INVALIDDATA
;
st
->
codec
->
block_align
=
align
*
st
->
codec
->
channels
;
switch
(
codec
)
{
case
4
:
st
->
codec
->
codec_id
=
AV_CODEC_ID_ADPCM_AICA
;
break
;
case
16
:
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_S16LE_PLANAR
;
break
;
default:
avpriv_request_sample
(
s
,
"codec %X"
,
codec
);
return
AVERROR_PATCHWELCOME
;
}
avio_skip
(
s
->
pb
,
0x800
-
avio_tell
(
s
->
pb
));
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
return
0
;
}
static
int
dcstr_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
AVCodecContext
*
codec
=
s
->
streams
[
0
]
->
codec
;
return
av_get_packet
(
s
->
pb
,
pkt
,
codec
->
block_align
);
}
AVInputFormat
ff_dcstr_demuxer
=
{
.
name
=
"dcstr"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Sega DC STR"
),
.
read_probe
=
dcstr_probe
,
.
read_header
=
dcstr_read_header
,
.
read_packet
=
dcstr_read_packet
,
.
extensions
=
"str"
,
.
flags
=
AVFMT_GENERIC_INDEX
|
AVFMT_NO_BYTE_SEEK
|
AVFMT_NOBINSEARCH
,
};
libavformat/version.h
View file @
48f0d3ac
...
...
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 1
2
#define LIBAVFORMAT_VERSION_MINOR 1
3
#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