LAV
/
libbluray
1
0
Fork 0
Code

Split function. Fixes mark tracking timings at clip boundaries.

This commit is contained in:
hpi1 2019-04-17 11:55:30 +03:00
parent 5b3c09b500
commit e82e243005
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/libbluray/bluray.c
View File

@ -1912,19 +1912,7 @@ static int64_t _clip_seek_time(BLURAY *bd, uint32_t tick)
static int _bd_read(BLURAY *bd, unsigned char *buf, int len)
{
BD_STREAM *st = &bd->st0;
int out_len;
if (st->fp) {
out_len = 0;
BD_DEBUG(DBG_STREAM, "Reading [%d bytes] at %"PRIu64"...\n", len, bd->s_pos);
if (st->clip == NULL) {
// We previously reached the last clip. Nothing
// else to read.
_queue_event(bd, BD_EVENT_END_OF_TITLE, 0);
bd->end_of_playlist |= 1;
return 0;
}
int out_len = 0;
while (len > 0) {
uint32_t clip_pkt;
@ -2058,18 +2046,38 @@ static int _bd_read(BLURAY *bd, unsigned char *buf, int len)
bd->s_pos += size;
}
/* mark tracking */
if (bd->next_mark >= 0 && bd->s_pos > bd->next_mark_pos) {
_playmark_reached(bd);
}
BD_DEBUG(DBG_STREAM, "%d bytes read OK!\n", out_len);
return out_len;
}
static int _bd_read_locked(BLURAY *bd, unsigned char *buf, int len)
{
BD_STREAM *st = &bd->st0;
int r;
if (!st->fp) {
BD_DEBUG(DBG_STREAM | DBG_CRIT, "bd_read(): no valid title selected!\n");
return -1;
}
BD_DEBUG(DBG_STREAM | DBG_CRIT, "bd_read(): no valid title selected!\n");
if (st->clip == NULL) {
// We previously reached the last clip. Nothing
// else to read.
_queue_event(bd, BD_EVENT_END_OF_TITLE, 0);
bd->end_of_playlist |= 1;
return 0;
}
return -1;
BD_DEBUG(DBG_STREAM, "Reading [%d bytes] at %"PRIu64"...\n", len, bd->s_pos);
r = _bd_read(bd, buf, len);
/* mark tracking */
if (bd->next_mark >= 0 && bd->s_pos > bd->next_mark_pos) {
_playmark_reached(bd);
}
return r;
}
int bd_read(BLURAY *bd, unsigned char *buf, int len)
@ -2077,7 +2085,7 @@ int bd_read(BLURAY *bd, unsigned char *buf, int len)
int result;
bd_mutex_lock(&bd->mutex);
result = _bd_read(bd, buf, len);
result = _bd_read_locked(bd, buf, len);
bd_mutex_unlock(&bd->mutex);
return result;
@ -3548,7 +3556,7 @@ static int _read_ext(BLURAY *bd, unsigned char *buf, int len, BD_EVENT *event)
}
}
int bytes = _bd_read(bd, buf, len);
int bytes = _bd_read_locked(bd, buf, len);
if (bytes == 0) {