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
725d6c61
Commit
725d6c61
authored
Dec 28, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add MPlayer subtitles demuxer.
parent
d9ac8d29
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
153 additions
and
2 deletions
+153
-2
Changelog
Changelog
+1
-1
general.texi
doc/general.texi
+1
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
mpsubdec.c
libavformat/mpsubdec.c
+140
-0
version.h
libavformat/version.h
+1
-1
subtitles.mak
tests/fate/subtitles.mak
+6
-0
sub-mpsub
tests/ref/fate/sub-mpsub
+1
-0
sub-mpsub-frames
tests/ref/fate/sub-mpsub-frames
+1
-0
No files found.
Changelog
View file @
725d6c61
...
@@ -51,7 +51,7 @@ version <next>:
...
@@ -51,7 +51,7 @@ version <next>:
- pp (postproc) filter ported from MPlayer
- pp (postproc) filter ported from MPlayer
- NIST Sphere demuxer
- NIST Sphere demuxer
- av_basename and av_dirname
- av_basename and av_dirname
- MPL2
and V
Player subtitles demuxers and decoders
- MPL2
, VPlayer and M
Player subtitles demuxers and decoders
version 1.0:
version 1.0:
...
...
doc/general.texi
View file @
725d6c61
...
@@ -925,6 +925,7 @@ performance on systems without hardware floating point support).
...
@@ -925,6 +925,7 @@ performance on systems without hardware floating point support).
@item JACOsub @tab X @tab X @tab @tab X
@item JACOsub @tab X @tab X @tab @tab X
@item MicroDVD @tab X @tab X @tab @tab X
@item MicroDVD @tab X @tab X @tab @tab X
@item MPL2 @tab @tab X @tab @tab X
@item MPL2 @tab @tab X @tab @tab X
@item MPsub (MPlayer) @tab @tab X @tab @tab X
@item PGS @tab @tab @tab @tab X
@item PGS @tab @tab @tab @tab X
@item RealText @tab @tab X @tab @tab X
@item RealText @tab @tab X @tab @tab X
@item SAMI @tab @tab X @tab @tab X
@item SAMI @tab @tab X @tab @tab X
...
...
libavformat/Makefile
View file @
725d6c61
...
@@ -220,6 +220,7 @@ OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
...
@@ -220,6 +220,7 @@ OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)
+=
mpegvideodec.o
rawdec.o
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)
+=
mpegvideodec.o
rawdec.o
OBJS-$(CONFIG_MPJPEG_MUXER)
+=
mpjpeg.o
OBJS-$(CONFIG_MPJPEG_MUXER)
+=
mpjpeg.o
OBJS-$(CONFIG_MPL2_DEMUXER)
+=
mpl2dec.o
OBJS-$(CONFIG_MPL2_DEMUXER)
+=
mpl2dec.o
OBJS-$(CONFIG_MPSUB_DEMUXER)
+=
mpsubdec.o
OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)
+=
msnwc_tcp.o
OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)
+=
msnwc_tcp.o
OBJS-$(CONFIG_MTV_DEMUXER)
+=
mtv.o
OBJS-$(CONFIG_MTV_DEMUXER)
+=
mtv.o
OBJS-$(CONFIG_MVI_DEMUXER)
+=
mvi.o
OBJS-$(CONFIG_MVI_DEMUXER)
+=
mvi.o
...
...
libavformat/allformats.c
View file @
725d6c61
...
@@ -183,6 +183,7 @@ void av_register_all(void)
...
@@ -183,6 +183,7 @@ void av_register_all(void)
REGISTER_DEMUXER
(
MPEGVIDEO
,
mpegvideo
);
REGISTER_DEMUXER
(
MPEGVIDEO
,
mpegvideo
);
REGISTER_MUXER
(
MPJPEG
,
mpjpeg
);
REGISTER_MUXER
(
MPJPEG
,
mpjpeg
);
REGISTER_DEMUXER
(
MPL2
,
mpl2
);
REGISTER_DEMUXER
(
MPL2
,
mpl2
);
REGISTER_DEMUXER
(
MPSUB
,
mpsub
);
REGISTER_DEMUXER
(
MSNWC_TCP
,
msnwc_tcp
);
REGISTER_DEMUXER
(
MSNWC_TCP
,
msnwc_tcp
);
REGISTER_DEMUXER
(
MTV
,
mtv
);
REGISTER_DEMUXER
(
MTV
,
mtv
);
REGISTER_DEMUXER
(
MV
,
mv
);
REGISTER_DEMUXER
(
MV
,
mv
);
...
...
libavformat/mpsubdec.c
0 → 100644
View file @
725d6c61
/*
* Copyright (c) 2012 Clément Bœsch
*
* 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
*/
/**
* @file
* MPlayer subtitles format demuxer
*/
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
typedef
struct
{
FFDemuxSubtitlesQueue
q
;
}
MPSubContext
;
static
int
mpsub_probe
(
AVProbeData
*
p
)
{
const
char
*
ptr
=
p
->
buf
;
const
char
*
ptr_end
=
p
->
buf
+
p
->
buf_size
;
while
(
ptr
<
ptr_end
)
{
int
n
;
if
(
!
memcmp
(
ptr
,
"FORMAT=TIME"
,
11
)
||
sscanf
(
ptr
,
"FORMAT=%d"
,
&
n
)
==
1
)
return
AVPROBE_SCORE_MAX
/
2
;
ptr
+=
strcspn
(
ptr
,
"
\n
"
)
+
1
;
}
return
0
;
}
static
int
mpsub_read_header
(
AVFormatContext
*
s
)
{
MPSubContext
*
mpsub
=
s
->
priv_data
;
AVStream
*
st
;
AVBPrint
buf
;
AVRational
pts_info
=
(
AVRational
){
100
,
1
};
// ts based by default
int
res
=
0
;
float
multiplier
=
100
.
0
;
float
current_pts
=
0
;
av_bprint_init
(
&
buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
while
(
!
url_feof
(
s
->
pb
))
{
char
line
[
1024
];
float
start
,
duration
;
int
fps
,
len
=
ff_get_line
(
s
->
pb
,
line
,
sizeof
(
line
));
if
(
!
len
)
break
;
line
[
strcspn
(
line
,
"
\r\n
"
)]
=
0
;
if
(
sscanf
(
line
,
"FORMAT=%d"
,
&
fps
)
==
1
&&
fps
>
3
&&
fps
<
100
)
{
/* frame based timing */
pts_info
=
(
AVRational
){
fps
,
1
};
multiplier
=
1
.
0
;
}
else
if
(
sscanf
(
line
,
"%f %f"
,
&
start
,
&
duration
)
==
2
)
{
AVPacket
*
sub
;
const
int64_t
pos
=
avio_tell
(
s
->
pb
);
ff_subtitles_read_chunk
(
s
->
pb
,
&
buf
);
if
(
buf
.
len
)
{
sub
=
ff_subtitles_queue_insert
(
&
mpsub
->
q
,
buf
.
str
,
buf
.
len
,
0
);
if
(
!
sub
)
{
res
=
AVERROR
(
ENOMEM
);
goto
end
;
}
sub
->
pts
=
(
int64_t
)(
current_pts
+
start
*
multiplier
);
sub
->
duration
=
(
int
)(
duration
*
multiplier
);
current_pts
+=
(
start
+
duration
)
*
multiplier
;
sub
->
pos
=
pos
;
}
}
}
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
avpriv_set_pts_info
(
st
,
64
,
pts_info
.
den
,
pts_info
.
num
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_SUBTITLE
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_TEXT
;
ff_subtitles_queue_finalize
(
&
mpsub
->
q
);
end:
av_bprint_finalize
(
&
buf
,
NULL
);
return
res
;
}
static
int
mpsub_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
MPSubContext
*
mpsub
=
s
->
priv_data
;
return
ff_subtitles_queue_read_packet
(
&
mpsub
->
q
,
pkt
);
}
static
int
mpsub_read_seek
(
AVFormatContext
*
s
,
int
stream_index
,
int64_t
min_ts
,
int64_t
ts
,
int64_t
max_ts
,
int
flags
)
{
MPSubContext
*
mpsub
=
s
->
priv_data
;
return
ff_subtitles_queue_seek
(
&
mpsub
->
q
,
s
,
stream_index
,
min_ts
,
ts
,
max_ts
,
flags
);
}
static
int
mpsub_read_close
(
AVFormatContext
*
s
)
{
MPSubContext
*
mpsub
=
s
->
priv_data
;
ff_subtitles_queue_clean
(
&
mpsub
->
q
);
return
0
;
}
AVInputFormat
ff_mpsub_demuxer
=
{
.
name
=
"mpsub"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPlayer subtitles"
),
.
priv_data_size
=
sizeof
(
MPSubContext
),
.
read_probe
=
mpsub_probe
,
.
read_header
=
mpsub_read_header
,
.
read_packet
=
mpsub_read_packet
,
.
read_seek2
=
mpsub_read_seek
,
.
read_close
=
mpsub_read_close
,
.
extensions
=
"sub"
,
};
libavformat/version.h
View file @
725d6c61
...
@@ -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 5
2
#define LIBAVFORMAT_VERSION_MINOR 5
3
#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, \
...
...
tests/fate/subtitles.mak
View file @
725d6c61
...
@@ -13,6 +13,12 @@ fate-sub-movtextenc: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -
...
@@ -13,6 +13,12 @@ fate-sub-movtextenc: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -
FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
fate-sub-mpl2: CMD = md5 -i $(SAMPLES)/sub/MPL2_capability_tester.txt -f ass
fate-sub-mpl2: CMD = md5 -i $(SAMPLES)/sub/MPL2_capability_tester.txt -f ass
FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub
fate-sub-mpsub: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester.sub -f ass
FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames
fate-sub-mpsub-frames: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester_frames.sub -f ass
FATE_SUBTITLES_ASS-$(call DEMDEC, REALTEXT, REALTEXT) += fate-sub-realtext
FATE_SUBTITLES_ASS-$(call DEMDEC, REALTEXT, REALTEXT) += fate-sub-realtext
fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f ass
fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f ass
...
...
tests/ref/fate/sub-mpsub
0 → 100644
View file @
725d6c61
2c5fafec41479e1d09a32f85e8927d03
tests/ref/fate/sub-mpsub-frames
0 → 100644
View file @
725d6c61
cbe6e45848ef77e3080487a88b122104
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