generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/realtextdec: UTF-16 support

Browse Source 
Also remove ff_smil_extract_next_chunk - this was the last user of it.
This commit is contained in:
wm4 2014-09-02 20:54:16 +02:00 committed by Clément Bœsch
parent 231a514dd3
commit b7f641dc9b
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/realtextdec.c
View File

@ -37,11 +37,12 @@ typedef struct {
static int realtext_probe(AVProbeData *p) static int realtext_probe(AVProbeData *p)
{ {
const unsigned char *ptr = p->buf; char buf[7];
FFTextReader tr;
ff_text_init_buf(&tr, p->buf, p->buf_size);
ff_text_read(&tr, buf, sizeof(buf));
if (AV_RB24(ptr) == 0xEFBBBF) return !av_strncasecmp(buf, "<window", 7) ? AVPROBE_SCORE_EXTENSION : 0;
ptr += 3; /* skip UTF-8 BOM */
return !av_strncasecmp(ptr, "<window", 7) ? AVPROBE_SCORE_EXTENSION : 0;
} }
static int read_ts(const char *s) static int read_ts(const char *s)
@ -63,6 +64,8 @@ static int realtext_read_header(AVFormatContext *s)
AVBPrint buf; AVBPrint buf;
char c = 0; char c = 0;
int res = 0, duration = read_ts("60"); // default duration is 60 seconds int res = 0, duration = read_ts("60"); // default duration is 60 seconds
FFTextReader tr;
ff_text_init_avio(&tr, s->pb);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -72,10 +75,10 @@ static int realtext_read_header(AVFormatContext *s)
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
while (!avio_feof(s->pb)) { while (!ff_text_eof(&tr)) {
AVPacket *sub; AVPacket *sub;
const int64_t pos = avio_tell(s->pb) - (c != 0); const int64_t pos = ff_text_pos(&tr) - (c != 0);
int n = ff_smil_extract_next_chunk(s->pb, &buf, &c); int n = ff_smil_extract_next_text_chunk(&tr, &buf, &c);
if (n == 0) if (n == 0)
break; break;

9
libavformat/subtitles.c
View File

@ -297,15 +297,6 @@ int ff_smil_extract_next_text_chunk(FFTextReader *tr, AVBPrint *buf, char *c)
return i; 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) const char *ff_smil_get_attr_ptr(const char *s, const char *attr)
{ {
int in_quotes = 0; int in_quotes = 0;

5
libavformat/subtitles.h
View File

@ -144,11 +144,6 @@ void ff_subtitles_queue_clean(FFDemuxSubtitlesQueue *q);
* *
* @param c cached character, to avoid a backward seek * @param c cached character, to avoid a backward seek
*/ */
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); int ff_smil_extract_next_text_chunk(FFTextReader *tr, AVBPrint *buf, char *c);
/** /**