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
1dab8d91
Commit
1dab8d91
authored
Nov 30, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/srtdec: switch to FFDemuxSubtitlesQueue API.
parent
0072116c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
62 additions
and
23 deletions
+62
-23
srtdec.c
libavformat/srtdec.c
+62
-23
No files found.
libavformat/srtdec.c
View file @
1dab8d91
...
@@ -21,9 +21,14 @@
...
@@ -21,9 +21,14 @@
#include "avformat.h"
#include "avformat.h"
#include "internal.h"
#include "internal.h"
#include "subtitles.h"
#include "libavutil/bprint.h"
#include "libavutil/bprint.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
typedef
struct
{
FFDemuxSubtitlesQueue
q
;
}
SRTContext
;
static
int
srt_probe
(
AVProbeData
*
p
)
static
int
srt_probe
(
AVProbeData
*
p
)
{
{
unsigned
char
*
ptr
=
p
->
buf
;
unsigned
char
*
ptr
=
p
->
buf
;
...
@@ -42,17 +47,6 @@ static int srt_probe(AVProbeData *p)
...
@@ -42,17 +47,6 @@ static int srt_probe(AVProbeData *p)
return
0
;
return
0
;
}
}
static
int
srt_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
avpriv_set_pts_info
(
st
,
64
,
1
,
1000
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_SUBTITLE
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_SUBRIP
;
return
0
;
}
static
int64_t
get_pts
(
const
char
**
buf
,
int
*
duration
,
static
int64_t
get_pts
(
const
char
**
buf
,
int
*
duration
,
int32_t
*
x1
,
int32_t
*
y1
,
int32_t
*
x2
,
int32_t
*
y2
)
int32_t
*
x1
,
int32_t
*
y1
,
int32_t
*
x2
,
int32_t
*
y2
)
{
{
...
@@ -87,6 +81,8 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf)
...
@@ -87,6 +81,8 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf)
char
eol_buf
[
5
];
char
eol_buf
[
5
];
int
n
=
0
,
i
=
0
,
nb_eol
=
0
;
int
n
=
0
,
i
=
0
,
nb_eol
=
0
;
av_bprint_clear
(
buf
);
for
(;;)
{
for
(;;)
{
char
c
=
avio_r8
(
pb
);
char
c
=
avio_r8
(
pb
);
...
@@ -127,31 +123,45 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf)
...
@@ -127,31 +123,45 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf)
av_bprintf
(
buf
,
"
\n
"
);
av_bprintf
(
buf
,
"
\n
"
);
}
}
static
int
srt_read_
packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
static
int
srt_read_
header
(
AVFormatContext
*
s
)
{
{
SRTContext
*
srt
=
s
->
priv_data
;
AVBPrint
buf
;
AVBPrint
buf
;
int64_t
pos
=
avio_tell
(
s
->
pb
);
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
int
res
=
AVERROR_EOF
;
int
res
=
0
;
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
avpriv_set_pts_info
(
st
,
64
,
1
,
1000
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_SUBTITLE
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_SUBRIP
;
av_bprint_init
(
&
buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
av_bprint_init
(
&
buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
while
(
!
url_feof
(
s
->
pb
))
{
read_chunk
(
s
->
pb
,
&
buf
);
read_chunk
(
s
->
pb
,
&
buf
);
if
(
buf
.
len
)
{
if
(
buf
.
len
)
{
int64_t
pos
=
avio_tell
(
s
->
pb
);
int64_t
pts
;
int64_t
pts
;
int
duration
,
pkt_size
;
int
duration
;
const
char
*
ptr
=
buf
.
str
;
const
char
*
ptr
=
buf
.
str
;
int32_t
x1
=
-
1
,
y1
=
-
1
,
x2
=
-
1
,
y2
=
-
1
;
int32_t
x1
=
-
1
,
y1
=
-
1
,
x2
=
-
1
,
y2
=
-
1
;
AVPacket
*
sub
;
pts
=
get_pts
(
&
ptr
,
&
duration
,
&
x1
,
&
y1
,
&
x2
,
&
y2
);
pts
=
get_pts
(
&
ptr
,
&
duration
,
&
x1
,
&
y1
,
&
x2
,
&
y2
);
pkt_size
=
buf
.
len
-
(
ptr
-
buf
.
str
);
if
(
pts
!=
AV_NOPTS_VALUE
)
{
if
(
pts
!=
AV_NOPTS_VALUE
&&
!
(
res
=
av_new_packet
(
pkt
,
pkt_size
)))
{
int
len
=
buf
.
len
-
(
ptr
-
buf
.
str
);
memcpy
(
pkt
->
data
,
ptr
,
pkt
->
size
);
sub
=
ff_subtitles_queue_insert
(
&
srt
->
q
,
ptr
,
len
,
0
);
pkt
->
flags
|=
AV_PKT_FLAG_KEY
;
if
(
!
sub
)
{
pkt
->
pos
=
pos
;
res
=
AVERROR
(
ENOMEM
);
pkt
->
pts
=
pkt
->
dts
=
pts
;
goto
end
;
pkt
->
duration
=
duration
;
}
sub
->
pos
=
pos
;
sub
->
pts
=
pts
;
sub
->
duration
=
duration
;
if
(
x1
!=
-
1
)
{
if
(
x1
!=
-
1
)
{
uint8_t
*
p
=
av_packet_new_side_data
(
pkt
,
AV_PKT_DATA_SUBTITLE_POSITION
,
16
);
uint8_t
*
p
=
av_packet_new_side_data
(
sub
,
AV_PKT_DATA_SUBTITLE_POSITION
,
16
);
if
(
p
)
{
if
(
p
)
{
AV_WL32
(
p
,
x1
);
AV_WL32
(
p
,
x1
);
AV_WL32
(
p
+
4
,
y1
);
AV_WL32
(
p
+
4
,
y1
);
...
@@ -161,15 +171,44 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -161,15 +171,44 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
}
}
}
}
}
}
}
ff_subtitles_queue_finalize
(
&
srt
->
q
);
end:
av_bprint_finalize
(
&
buf
,
NULL
);
av_bprint_finalize
(
&
buf
,
NULL
);
return
res
;
return
res
;
}
}
static
int
srt_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
SRTContext
*
srt
=
s
->
priv_data
;
return
ff_subtitles_queue_read_packet
(
&
srt
->
q
,
pkt
);
}
static
int
srt_read_seek
(
AVFormatContext
*
s
,
int
stream_index
,
int64_t
min_ts
,
int64_t
ts
,
int64_t
max_ts
,
int
flags
)
{
SRTContext
*
srt
=
s
->
priv_data
;
return
ff_subtitles_queue_seek
(
&
srt
->
q
,
s
,
stream_index
,
min_ts
,
ts
,
max_ts
,
flags
);
}
static
int
srt_read_close
(
AVFormatContext
*
s
)
{
SRTContext
*
srt
=
s
->
priv_data
;
ff_subtitles_queue_clean
(
&
srt
->
q
);
return
0
;
}
AVInputFormat
ff_srt_demuxer
=
{
AVInputFormat
ff_srt_demuxer
=
{
.
name
=
"srt"
,
.
name
=
"srt"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SubRip subtitle"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SubRip subtitle"
),
.
priv_data_size
=
sizeof
(
SRTContext
),
.
read_probe
=
srt_probe
,
.
read_probe
=
srt_probe
,
.
read_header
=
srt_read_header
,
.
read_header
=
srt_read_header
,
.
read_packet
=
srt_read_packet
,
.
read_packet
=
srt_read_packet
,
.
read_seek2
=
srt_read_seek
,
.
read_close
=
srt_read_close
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
};
};
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