virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mov: simplify mov_read_chapters() by using avio_get_str16be

Browse Source 
It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 225b6d7fde)
This commit is contained in:
Anton Khirnov 2011-01-23 12:35:23 +01:00 committed by Michael Niedermayer
parent bc1aebcd07
commit ebf3ee16c7
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/mov.c
View File

@ -2284,8 +2284,7 @@ static void mov_read_chapters(AVFormatContext *s)
AVStream *st = NULL;
MOVStreamContext *sc;
int64_t cur_pos;
uint8_t *title = NULL;
int i, len, i8, i16;
int i;
for (i = 0; i < s->nb_streams; i++)
if (s->streams[i]->id == mov->chapter_track) {
@ -2304,43 +2303,38 @@ static void mov_read_chapters(AVFormatContext *s)
for (i = 0; i < st->nb_index_entries; i++) {
AVIndexEntry *sample = &st->index_entries[i];
int64_t end = i+1 < st->nb_index_entries ? st->index_entries[i+1].timestamp : st->duration;
uint8_t *title;
uint16_t ch;
int len, title_len;
if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
av_log(s, AV_LOG_ERROR, "Chapter %d not found in file\n", i);
goto finish;
}
title = av_malloc(sample->size+2);
get_buffer(sc->pb, title, sample->size);
// the first two bytes are the length of the title
len = AV_RB16(title);
len = get_be16(sc->pb);
if (len > sample->size-2)
continue;
title_len = 2*len + 1;
if (!(title = av_mallocz(title_len)))
goto finish;
// The samples could theoretically be in any encoding if there's an encd
// atom following, but in practice are only utf-8 or utf-16, distinguished
// instead by the presence of a BOM
if (AV_RB16(title+2) == 0xfeff) {
uint8_t *utf8 = av_malloc(2*len+3);
i8 = i16 = 0;
while (i16 < len) {
uint32_t ch;
uint8_t tmp;
GET_UTF16(ch, i16 < len ? AV_RB16(title + (i16+=2)) : 0, break;)
PUT_UTF8(ch, tmp, if (i8 < 2*len) utf8[2+i8++] = tmp;)
}
utf8[2+i8] = 0;
av_freep(&title);
title = utf8;
ch = get_be16(sc->pb);
if (ch == 0xfeff)
avio_get_str16be(sc->pb, len, title, title_len);
else {
AV_WB16(title, ch);
get_strz(sc->pb, title + 2, len - 1);
}
ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title+2);
ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title);
av_freep(&title);
}
finish:
av_free(title);
url_fseek(sc->pb, cur_pos, SEEK_SET);
}