Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
231a514d
Commit
231a514d
authored
Sep 02, 2014
by
wm4
Committed by
Clément Bœsch
Sep 05, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/samidec: UTF-16 support
ff_smil_extract_next_chunk() is still used by RealText.
parent
d658ef18
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
10 deletions
+27
-10
samidec.c
libavformat/samidec.c
+10
-7
subtitles.c
libavformat/subtitles.c
+12
-3
subtitles.h
libavformat/subtitles.h
+5
-0
No files found.
libavformat/samidec.c
View file @
231a514d
...
...
@@ -38,11 +38,12 @@ typedef struct {
static
int
sami_probe
(
AVProbeData
*
p
)
{
const
unsigned
char
*
ptr
=
p
->
buf
;
char
buf
[
6
];
FFTextReader
tr
;
ff_text_init_buf
(
&
tr
,
p
->
buf
,
p
->
buf_size
);
ff_text_read
(
&
tr
,
buf
,
sizeof
(
buf
));
if
(
AV_RB24
(
ptr
)
==
0xEFBBBF
)
ptr
+=
3
;
/* skip UTF-8 BOM */
return
!
strncmp
(
ptr
,
"<SAMI>"
,
6
)
?
AVPROBE_SCORE_MAX
:
0
;
return
!
strncmp
(
buf
,
"<SAMI>"
,
6
)
?
AVPROBE_SCORE_MAX
:
0
;
}
static
int
sami_read_header
(
AVFormatContext
*
s
)
...
...
@@ -52,6 +53,8 @@ static int sami_read_header(AVFormatContext *s)
AVBPrint
buf
,
hdr_buf
;
char
c
=
0
;
int
res
=
0
,
got_first_sync_point
=
0
;
FFTextReader
tr
;
ff_text_init_avio
(
&
tr
,
s
->
pb
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
...
...
@@ -62,10 +65,10 @@ static int sami_read_header(AVFormatContext *s)
av_bprint_init
(
&
buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
av_bprint_init
(
&
hdr_buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
while
(
!
avio_feof
(
s
->
pb
))
{
while
(
!
ff_text_eof
(
&
tr
))
{
AVPacket
*
sub
;
const
int64_t
pos
=
avio_tell
(
s
->
pb
)
-
(
c
!=
0
);
int
is_sync
,
n
=
ff_smil_extract_next_
chunk
(
s
->
pb
,
&
buf
,
&
c
);
const
int64_t
pos
=
ff_text_pos
(
&
tr
)
-
(
c
!=
0
);
int
is_sync
,
n
=
ff_smil_extract_next_
text_chunk
(
&
tr
,
&
buf
,
&
c
);
if
(
n
==
0
)
break
;
...
...
libavformat/subtitles.c
View file @
231a514d
...
...
@@ -274,20 +274,20 @@ void ff_subtitles_queue_clean(FFDemuxSubtitlesQueue *q)
q
->
nb_subs
=
q
->
allocated_size
=
q
->
current_sub_idx
=
0
;
}
int
ff_smil_extract_next_
chunk
(
AVIOContext
*
pb
,
AVBPrint
*
buf
,
char
*
c
)
int
ff_smil_extract_next_
text_chunk
(
FFTextReader
*
tr
,
AVBPrint
*
buf
,
char
*
c
)
{
int
i
=
0
;
char
end_chr
;
if
(
!*
c
)
// cached char?
*
c
=
avio_r8
(
pb
);
*
c
=
ff_text_r8
(
tr
);
if
(
!*
c
)
return
0
;
end_chr
=
*
c
==
'<'
?
'>'
:
'<'
;
do
{
av_bprint_chars
(
buf
,
*
c
,
1
);
*
c
=
avio_r8
(
pb
);
*
c
=
ff_text_r8
(
tr
);
i
++
;
}
while
(
*
c
!=
end_chr
&&
*
c
);
if
(
end_chr
==
'>'
)
{
...
...
@@ -297,6 +297,15 @@ int ff_smil_extract_next_chunk(AVIOContext *pb, AVBPrint *buf, char *c)
return
i
;
}
int
ff_smil_extract_next_chunk
(
AVIOContext
*
pb
,
AVBPrint
*
buf
,
char
*
c
)
{
FFTextReader
tr
;
tr
.
buf_pos
=
tr
.
buf_len
=
0
;
tr
.
type
=
0
;
tr
.
pb
=
pb
;
return
ff_smil_extract_next_text_chunk
(
&
tr
,
buf
,
c
);
}
const
char
*
ff_smil_get_attr_ptr
(
const
char
*
s
,
const
char
*
attr
)
{
int
in_quotes
=
0
;
...
...
libavformat/subtitles.h
View file @
231a514d
...
...
@@ -146,6 +146,11 @@ void ff_subtitles_queue_clean(FFDemuxSubtitlesQueue *q);
*/
int
ff_smil_extract_next_chunk
(
AVIOContext
*
pb
,
AVBPrint
*
buf
,
char
*
c
);
/**
* As ff_smil_extract_next_chunk(), but with FFTextReader.
*/
int
ff_smil_extract_next_text_chunk
(
FFTextReader
*
tr
,
AVBPrint
*
buf
,
char
*
c
);
/**
* SMIL helper to point on the value of an attribute in the given tag.
*
...
...
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