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
bef8fd70
Commit
bef8fd70
authored
Mar 19, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LucasArts SMUSH demuxer
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
69254f46
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
238 additions
and
1 deletion
+238
-1
Changelog
Changelog
+1
-0
general.texi
doc/general.texi
+2
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
smush.c
libavformat/smush.c
+232
-0
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
bef8fd70
...
@@ -13,6 +13,7 @@ version next:
...
@@ -13,6 +13,7 @@ version next:
- iLBC encoding/decoding via libilbc
- iLBC encoding/decoding via libilbc
- Microsoft Screen 1 decoder
- Microsoft Screen 1 decoder
- showwaves filter
- showwaves filter
- LucasArts SMUSH playback support
version 0.11:
version 0.11:
...
...
doc/general.texi
View file @
bef8fd70
...
@@ -335,6 +335,8 @@ library:
...
@@ -335,6 +335,8 @@ library:
@tab Multimedia format used by many games.
@tab Multimedia format used by many games.
@item SMJPEG @tab X @tab X
@item SMJPEG @tab X @tab X
@tab Used in certain Loki game ports.
@tab Used in certain Loki game ports.
@item Smush
@tab Multimedia format used in some LucasArts games.
@item Sony OpenMG (OMA) @tab X @tab X
@item Sony OpenMG (OMA) @tab X @tab X
@tab Audio format used in Sony Sonic Stage and Sony Vegas.
@tab Audio format used in Sony Sonic Stage and Sony Vegas.
@item Sony PlayStation STR @tab @tab X
@item Sony PlayStation STR @tab @tab X
...
...
libavformat/Makefile
View file @
bef8fd70
...
@@ -306,6 +306,7 @@ OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
...
@@ -306,6 +306,7 @@ OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
OBJS-$(CONFIG_SMACKER_DEMUXER)
+=
smacker.o
OBJS-$(CONFIG_SMACKER_DEMUXER)
+=
smacker.o
OBJS-$(CONFIG_SMJPEG_DEMUXER)
+=
smjpegdec.o
smjpeg.o
OBJS-$(CONFIG_SMJPEG_DEMUXER)
+=
smjpegdec.o
smjpeg.o
OBJS-$(CONFIG_SMJPEG_MUXER)
+=
smjpegenc.o
smjpeg.o
OBJS-$(CONFIG_SMJPEG_MUXER)
+=
smjpegenc.o
smjpeg.o
OBJS-$(CONFIG_SMUSH_DEMUXER)
+=
smush.o
OBJS-$(CONFIG_SOL_DEMUXER)
+=
sol.o
pcm.o
OBJS-$(CONFIG_SOL_DEMUXER)
+=
sol.o
pcm.o
OBJS-$(CONFIG_SOX_DEMUXER)
+=
soxdec.o
pcm.o
OBJS-$(CONFIG_SOX_DEMUXER)
+=
soxdec.o
pcm.o
OBJS-$(CONFIG_SOX_MUXER)
+=
soxenc.o
OBJS-$(CONFIG_SOX_MUXER)
+=
soxenc.o
...
...
libavformat/allformats.c
View file @
bef8fd70
...
@@ -219,6 +219,7 @@ void av_register_all(void)
...
@@ -219,6 +219,7 @@ void av_register_all(void)
REGISTER_DEMUXER
(
SIFF
,
siff
);
REGISTER_DEMUXER
(
SIFF
,
siff
);
REGISTER_DEMUXER
(
SMACKER
,
smacker
);
REGISTER_DEMUXER
(
SMACKER
,
smacker
);
REGISTER_MUXDEMUX
(
SMJPEG
,
smjpeg
);
REGISTER_MUXDEMUX
(
SMJPEG
,
smjpeg
);
REGISTER_DEMUXER
(
SMUSH
,
smush
);
REGISTER_DEMUXER
(
SOL
,
sol
);
REGISTER_DEMUXER
(
SOL
,
sol
);
REGISTER_MUXDEMUX
(
SOX
,
sox
);
REGISTER_MUXDEMUX
(
SOX
,
sox
);
REGISTER_MUXDEMUX
(
SPDIF
,
spdif
);
REGISTER_MUXDEMUX
(
SPDIF
,
spdif
);
...
...
libavformat/smush.c
0 → 100644
View file @
bef8fd70
/*
* LucasArts Smush demuxer
* Copyright (c) 2006 Cyril Zorin
*
* 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 "avformat.h"
#include "internal.h"
#include "avio.h"
typedef
struct
{
int
version
;
int
audio_stream_index
;
int
video_stream_index
;
}
SMUSHContext
;
static
int
smush_read_probe
(
AVProbeData
*
p
)
{
if
((
AV_RL32
(
p
->
buf
)
==
MKTAG
(
'S'
,
'A'
,
'N'
,
'M'
)
||
AV_RL32
(
p
->
buf
)
==
MKTAG
(
'A'
,
'N'
,
'I'
,
'M'
)))
{
return
AVPROBE_SCORE_MAX
;
}
return
0
;
}
static
int
smush_read_header
(
AVFormatContext
*
ctx
)
{
SMUSHContext
*
smush
=
ctx
->
priv_data
;
AVIOContext
*
pb
=
ctx
->
pb
;
AVStream
*
vst
,
*
ast
;
uint32_t
magic
,
nframes
,
size
,
subversion
,
i
;
uint32_t
width
=
0
,
height
=
0
,
got_audio
=
0
,
read
=
0
;
uint32_t
sample_rate
,
channels
,
palette
[
256
];
magic
=
avio_rb32
(
pb
);
avio_skip
(
pb
,
4
);
// skip movie size
if
(
magic
==
MKBETAG
(
'A'
,
'N'
,
'I'
,
'M'
))
{
if
(
avio_rb32
(
pb
)
!=
MKBETAG
(
'A'
,
'H'
,
'D'
,
'R'
))
return
AVERROR_INVALIDDATA
;
size
=
avio_rb32
(
pb
);
if
(
size
<
3
*
256
+
6
)
return
AVERROR_INVALIDDATA
;
smush
->
version
=
0
;
subversion
=
avio_rl16
(
pb
);
nframes
=
avio_rl16
(
pb
);
avio_skip
(
pb
,
2
);
// skip pad
for
(
i
=
0
;
i
<
256
;
i
++
)
palette
[
i
]
=
avio_rb24
(
pb
);
avio_skip
(
pb
,
size
-
(
3
*
256
+
6
));
}
else
if
(
magic
==
MKBETAG
(
'S'
,
'A'
,
'N'
,
'M'
)
)
{
if
(
avio_rb32
(
pb
)
!=
MKBETAG
(
'S'
,
'H'
,
'D'
,
'R'
))
return
AVERROR_INVALIDDATA
;
size
=
avio_rb32
(
pb
);
if
(
size
<
14
)
return
AVERROR_INVALIDDATA
;
smush
->
version
=
1
;
avio_skip
(
pb
,
2
);
// skip version
nframes
=
avio_rl32
(
pb
);
avio_skip
(
pb
,
2
);
// skip pad
width
=
avio_rl16
(
pb
);
height
=
avio_rl16
(
pb
);
avio_skip
(
pb
,
2
);
// skip pad
avio_skip
(
pb
,
size
-
14
);
if
(
avio_rb32
(
pb
)
!=
MKBETAG
(
'F'
,
'L'
,
'H'
,
'D'
))
return
AVERROR_INVALIDDATA
;
size
=
avio_rb32
(
pb
);
while
(
!
got_audio
&&
((
read
+
8
)
<
size
))
{
uint32_t
sig
,
chunk_size
;
if
(
url_feof
(
pb
))
return
AVERROR_EOF
;
sig
=
avio_rb32
(
pb
);
chunk_size
=
avio_rb32
(
pb
);
read
+=
8
;
switch
(
sig
)
{
case
MKBETAG
(
'W'
,
'a'
,
'v'
,
'e'
):
got_audio
=
1
;
sample_rate
=
avio_rl32
(
pb
);
channels
=
avio_rl32
(
pb
);
avio_skip
(
pb
,
chunk_size
-
8
);
read
+=
chunk_size
;
break
;
case
MKBETAG
(
'B'
,
'l'
,
'1'
,
'6'
):
case
MKBETAG
(
'A'
,
'N'
,
'N'
,
'O'
):
avio_skip
(
pb
,
chunk_size
);
read
+=
chunk_size
;
break
;
default:
return
AVERROR_INVALIDDATA
;
break
;
}
}
avio_skip
(
pb
,
size
-
read
);
}
else
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Wrong magic
\n
"
);
return
AVERROR_INVALIDDATA
;
}
vst
=
avformat_new_stream
(
ctx
,
0
);
if
(
!
vst
)
return
AVERROR
(
ENOMEM
);
smush
->
video_stream_index
=
vst
->
index
;
vst
->
start_time
=
0
;
vst
->
duration
=
vst
->
nb_frames
=
nframes
;
vst
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
vst
->
codec
->
codec_id
=
CODEC_ID_SANM
;
vst
->
codec
->
codec_tag
=
0
;
vst
->
codec
->
width
=
width
;
vst
->
codec
->
height
=
height
;
avpriv_set_pts_info
(
vst
,
64
,
66667
,
1000000
);
if
(
!
smush
->
version
)
{
vst
->
codec
->
extradata
=
av_malloc
(
1024
+
2
+
FF_INPUT_BUFFER_PADDING_SIZE
);
if
(
!
vst
->
codec
->
extradata
)
return
AVERROR
(
ENOMEM
);
vst
->
codec
->
extradata_size
=
1024
+
2
;
AV_WL16
(
vst
->
codec
->
extradata
,
subversion
);
for
(
i
=
0
;
i
<
256
;
i
++
)
AV_WL32
(
vst
->
codec
->
extradata
+
2
+
i
*
4
,
palette
[
i
]);
}
if
(
got_audio
)
{
ast
=
avformat_new_stream
(
ctx
,
0
);
if
(
!
ast
)
return
AVERROR
(
ENOMEM
);
smush
->
audio_stream_index
=
ast
->
index
;
ast
->
start_time
=
0
;
ast
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
ast
->
codec
->
codec_id
=
CODEC_ID_VIMA
;
ast
->
codec
->
codec_tag
=
0
;
ast
->
codec
->
sample_rate
=
sample_rate
;
ast
->
codec
->
channels
=
channels
;
avpriv_set_pts_info
(
ast
,
64
,
1
,
ast
->
codec
->
sample_rate
);
}
return
0
;
}
static
int
smush_read_packet
(
AVFormatContext
*
ctx
,
AVPacket
*
pkt
)
{
SMUSHContext
*
smush
=
ctx
->
priv_data
;
AVIOContext
*
pb
=
ctx
->
pb
;
int
done
=
0
;
while
(
!
done
)
{
uint32_t
sig
,
size
;
if
(
url_feof
(
pb
))
return
AVERROR_EOF
;
sig
=
avio_rb32
(
pb
);
size
=
avio_rb32
(
pb
);
switch
(
sig
)
{
case
MKBETAG
(
'F'
,
'R'
,
'M'
,
'E'
):
if
(
smush
->
version
)
break
;
if
(
av_get_packet
(
pb
,
pkt
,
size
)
<
0
)
return
AVERROR
(
EIO
);
pkt
->
stream_index
=
smush
->
video_stream_index
;
done
=
1
;
break
;
case
MKBETAG
(
'B'
,
'l'
,
'1'
,
'6'
):
if
(
av_get_packet
(
pb
,
pkt
,
size
)
<
0
)
return
AVERROR
(
EIO
);
pkt
->
stream_index
=
smush
->
video_stream_index
;
pkt
->
duration
=
1
;
done
=
1
;
break
;
case
MKBETAG
(
'W'
,
'a'
,
'v'
,
'e'
):
if
(
av_get_packet
(
pb
,
pkt
,
size
)
<
0
)
return
AVERROR
(
EIO
);
pkt
->
stream_index
=
smush
->
audio_stream_index
;
done
=
1
;
break
;
default:
avio_skip
(
pb
,
size
);
break
;
}
}
return
0
;
}
AVInputFormat
ff_smush_demuxer
=
{
.
name
=
"smush"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"LucasArts Smush"
),
.
priv_data_size
=
sizeof
(
SMUSHContext
),
.
read_probe
=
smush_read_probe
,
.
read_header
=
smush_read_header
,
.
read_packet
=
smush_read_packet
,
};
libavformat/version.h
View file @
bef8fd70
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR
9
#define LIBAVFORMAT_VERSION_MINOR
10
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
#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