EbmlList encodings;
AVStream *stream;
+ int64_t end_timecode;
} MatroskaTrack;
typedef struct {
EbmlList seekhead;
/* byte position of the segment inside the stream */
- offset_t segment_start;
+ int64_t segment_start;
/* the packet queue */
AVPacket **packets;
int num_packets;
+ AVPacket *prev_pkt;
int done;
int has_cluster_id;
/* What to skip before effectively reading a packet. */
int skip_to_keyframe;
- AVStream *skip_to_stream;
+ uint64_t skip_to_timecode;
} MatroskaDemuxContext;
typedef struct {
EbmlList blocks;
} MatroskaCluster;
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(*x))
-
static EbmlSyntax ebml_header[] = {
{ EBML_ID_EBMLREADVERSION, EBML_UINT, 0, offsetof(Ebml,version), {.u=EBML_VERSION} },
{ EBML_ID_EBMLMAXSIZELENGTH, EBML_UINT, 0, offsetof(Ebml,max_size), {.u=8} },
static int ebml_level_end(MatroskaDemuxContext *matroska)
{
ByteIOContext *pb = matroska->ctx->pb;
- offset_t pos = url_ftell(pb);
+ int64_t pos = url_ftell(pb);
if (matroska->num_levels > 0) {
MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1];
if (!(total = get_byte(pb))) {
/* we might encounter EOS here */
if (!url_feof(pb)) {
- offset_t pos = url_ftell(pb);
+ int64_t pos = url_ftell(pb);
av_log(matroska->ctx, AV_LOG_ERROR,
"Read error at pos. %"PRIu64" (0x%"PRIx64")\n",
pos, pos);
len_mask >>= 1;
}
if (read > max_size) {
- offset_t pos = url_ftell(pb) - 1;
+ int64_t pos = url_ftell(pb) - 1;
av_log(matroska->ctx, AV_LOG_ERROR,
"Invalid EBML number size tag 0x%02x at pos %"PRIu64" (0x%"PRIx64")\n",
(uint8_t) total, pos, pos);
}
static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
- AVPacket *pkt)
+ AVPacket *pkt, uint64_t display_duration)
{
char *line, *layer, *ptr = pkt->data, *end = ptr+pkt->size;
for (; *ptr!=',' && ptr<end-1; ptr++);
layer = ++ptr;
for (; *ptr!=',' && ptr<end-1; ptr++);
if (*ptr == ',') {
- int64_t end_pts = pkt->pts + pkt->convergence_duration;
+ int64_t end_pts = pkt->pts + display_duration;
int sc = matroska->time_scale * pkt->pts / 10000000;
int ec = matroska->time_scale * end_pts / 10000000;
int sh, sm, ss, eh, em, es, len;
len = 50 + end-ptr + FF_INPUT_BUFFER_PADDING_SIZE;
if (!(line = av_malloc(len)))
return;
- snprintf(line,len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s",
+ snprintf(line,len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
av_free(pkt->data);
pkt->data = line;
}
}
+static void matroska_merge_packets(AVPacket *out, AVPacket *in)
+{
+ out->data = av_realloc(out->data, out->size+in->size);
+ memcpy(out->data+out->size, in->data, in->size);
+ out->size += in->size;
+ av_destruct_packet(in);
+ av_free(in);
+}
+
static void matroska_convert_tags(AVFormatContext *s, EbmlList *list)
{
MatroskaTag *tags = list->elem;
int i, j;
for (i=0; i < list->nb_elem; i++) {
- for (j=0; j < ARRAY_SIZE(metadata); j++){
+ for (j=0; j < FF_ARRAY_ELEMS(metadata); j++){
if (!strcmp(tags[i].name, metadata[j].name)) {
int *ptr = (int *)((char *)s + metadata[j].offset);
if (*ptr) continue;
EbmlList *seekhead_list = &matroska->seekhead;
MatroskaSeekhead *seekhead = seekhead_list->elem;
uint32_t level_up = matroska->level_up;
- offset_t before_pos = url_ftell(matroska->ctx->pb);
+ int64_t before_pos = url_ftell(matroska->ctx->pb);
MatroskaLevel level;
int i;
for (i=0; i<seekhead_list->nb_elem; i++) {
- offset_t offset = seekhead[i].pos + matroska->segment_start;
+ int64_t offset = seekhead[i].pos + matroska->segment_start;
if (seekhead[i].pos <= before_pos
|| seekhead[i].id == MATROSKA_ID_SEEKHEAD
static const char * const aac_profiles[] = { "MAIN", "LC", "SSR" };
int profile;
- for (profile=0; profile<ARRAY_SIZE(aac_profiles); profile++)
+ for (profile=0; profile<FF_ARRAY_ELEMS(aac_profiles); profile++)
if (strstr(codec_id, aac_profiles[profile]))
break;
return profile + 1;
{
int sri;
- for (sri=0; sri<ARRAY_SIZE(ff_mpeg4audio_sample_rates); sri++)
+ for (sri=0; sri<FF_ARRAY_ELEMS(ff_mpeg4audio_sample_rates); sri++)
if (ff_mpeg4audio_sample_rates[sri] == samplerate)
break;
return sri;
MatroskaTrack *tracks;
EbmlList *index_list;
MatroskaIndex *index;
+ int index_scale = 1;
Ebml ebml = { 0 };
AVStream *st;
int i, j;
index_list = &matroska->index;
index = index_list->elem;
+ if (index_list->nb_elem
+ && index[0].time > 100000000000000/matroska->time_scale) {
+ av_log(matroska->ctx, AV_LOG_WARNING, "Working around broken index.\n");
+ index_scale = matroska->time_scale;
+ }
for (i=0; i<index_list->nb_elem; i++) {
EbmlList *pos_list = &index[i].pos;
MatroskaIndexPos *pos = pos_list->elem;
if (track && track->stream)
av_add_index_entry(track->stream,
pos[j].pos + matroska->segment_start,
- index[i].time, 0, 0, AVINDEX_KEYFRAME);
+ index[i].time/index_scale, 0, 0,
+ AVINDEX_KEYFRAME);
}
}
if (cluster_time != (uint64_t)-1
&& (block_time >= 0 || cluster_time >= -block_time)) {
timecode = cluster_time + block_time;
+ if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE
+ && timecode < track->end_timecode)
+ is_keyframe = 0; /* overlapping subtitles are not key frame */
if (is_keyframe)
av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME);
+ track->end_timecode = FFMAX(track->end_timecode, timecode+duration);
}
- if (matroska->skip_to_keyframe) {
- if (!is_keyframe || st != matroska->skip_to_stream)
+ if (matroska->skip_to_keyframe && track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {
+ if (!is_keyframe || timecode < matroska->skip_to_timecode)
return res;
matroska->skip_to_keyframe = 0;
}
pkt->pts = timecode;
pkt->pos = pos;
- if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE)
+ if (st->codec->codec_id == CODEC_ID_TEXT)
pkt->convergence_duration = duration;
- else
+ else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
pkt->duration = duration;
if (st->codec->codec_id == CODEC_ID_SSA)
- matroska_fix_ass_packet(matroska, pkt);
-
- dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
+ matroska_fix_ass_packet(matroska, pkt, duration);
+
+ if (matroska->prev_pkt &&
+ timecode != AV_NOPTS_VALUE &&
+ matroska->prev_pkt->pts == timecode &&
+ matroska->prev_pkt->stream_index == st->index)
+ matroska_merge_packets(matroska->prev_pkt, pkt);
+ else {
+ dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
+ matroska->prev_pkt = pkt;
+ }
}
if (timecode != AV_NOPTS_VALUE)
EbmlList *blocks_list;
MatroskaBlock *blocks;
int i, res;
- offset_t pos = url_ftell(matroska->ctx->pb);
+ int64_t pos = url_ftell(matroska->ctx->pb);
+ matroska->prev_pkt = NULL;
if (matroska->has_cluster_id){
/* For the first cluster we parse, its ID was already read as
part of matroska_read_header(), so don't read it again */
int64_t timestamp, int flags)
{
MatroskaDemuxContext *matroska = s->priv_data;
+ MatroskaTrack *tracks = matroska->tracks.elem;
AVStream *st = s->streams[stream_index];
- int index;
+ int i, index, index_sub, index_min;
- if (timestamp < 0)
- timestamp = 0;
+ if (!st->nb_index_entries)
+ return 0;
+ timestamp = FFMAX(timestamp, st->index_entries[0].timestamp);
if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
- if (st->nb_index_entries)
- url_fseek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET);
+ url_fseek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET);
while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
matroska_clear_queue(matroska);
if (matroska_parse_cluster(matroska) < 0)
if (index < 0)
return 0;
- url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
+ index_min = index;
+ for (i=0; i < matroska->tracks.nb_elem; i++) {
+ tracks[i].end_timecode = 0;
+ if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE
+ && !tracks[i].stream->discard != AVDISCARD_ALL) {
+ index_sub = av_index_search_timestamp(tracks[i].stream, st->index_entries[index].timestamp, AVSEEK_FLAG_BACKWARD);
+ if (index_sub >= 0
+ && st->index_entries[index_sub].pos < st->index_entries[index_min].pos
+ && st->index_entries[index].timestamp - st->index_entries[index_sub].timestamp < 30000000000/matroska->time_scale)
+ index_min = index_sub;
+ }
+ }
+
+ url_fseek(s->pb, st->index_entries[index_min].pos, SEEK_SET);
matroska->skip_to_keyframe = !(flags & AVSEEK_FLAG_ANY);
- matroska->skip_to_stream = st;
+ matroska->skip_to_timecode = st->index_entries[index].timestamp;
matroska->done = 0;
av_update_cur_dts(s, st, st->index_entries[index].timestamp);
return 0;
projects / ffmpeg / blobdiff