mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Add matroska v2 (SimpleBlock) support.

Browse Source 
Patch by Federico Menarini (federico d menarini a gmail d com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19983 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2006-09-25 21:17:43 +00:00
parent ed909ff5d5
commit f7e89b57fa
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libmpdemux/demux_mkv.c
View File

@ -2415,7 +2415,7 @@ demux_mkv_open (demuxer_t *demuxer)
stream_seek(s, s->start_pos);
str = ebml_read_header (s, &version);
if (str == NULL || strcmp (str, "matroska") || version > 1)
if (str == NULL || strcmp (str, "matroska") || version > 2)
{
mp_msg (MSGT_DEMUX, MSGL_DBG2, "[mkv] no head found\n");
return 0;
@ -3314,7 +3314,7 @@ handle_video_bframes (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer,
static int
handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
uint64_t block_duration, int64_t block_bref, int64_t block_fref)
uint64_t block_duration, int64_t block_bref, int64_t block_fref, uint8_t simpleblock)
{
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
mkv_track_t *track = NULL;
@ -3322,7 +3322,7 @@ handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
uint64_t old_length;
int64_t tc;
uint32_t *lace_size;
uint8_t laces;
uint8_t laces, flags;
int i, num, tmp, use_this_block = 1;
float current_pts;
int16_t time;
@ -3335,6 +3335,7 @@ handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
block += 2;
length -= tmp + 2;
old_length = length;
flags = block[0];
if (demux_mkv_read_block_lacing (block, &length, &laces, &lace_size))
return 0;
block += old_length - length;
@ -3364,8 +3365,16 @@ handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
{
ds = demuxer->audio;
if (mkv_d->a_skip_to_keyframe && block_bref != 0)
if (mkv_d->a_skip_to_keyframe)
{
if (simpleblock)
{
if (!(flags&0x80)) /*current frame isn't a keyframe*/
use_this_block = 0;
}
else if (block_bref != 0)
use_this_block = 0;
}
else if (mkv_d->v_skip_to_keyframe)
use_this_block = 0;
@ -3392,9 +3401,17 @@ handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
else if (num == demuxer->video->id)
{
ds = demuxer->video;
if (mkv_d->v_skip_to_keyframe && (block_bref != 0 || block_fref != 0))
if (mkv_d->v_skip_to_keyframe)
{
if (simpleblock)
{
if (!(flags&0x80)) /*current frame isn't a keyframe*/
use_this_block = 0;
}
else if (block_bref != 0 || block_fref != 0)
use_this_block = 0;
}
}
else if (num == demuxer->sub->id)
{
ds = demuxer->sub;
@ -3527,7 +3544,7 @@ demux_mkv_fill_buffer (demuxer_t *demuxer, demux_stream_t *ds)
if (block)
{
int res = handle_block (demuxer, block, block_length,
block_duration, block_bref, block_fref);
block_duration, block_bref, block_fref, 0);
free (block);
if (res < 0)
return 0;
@ -3558,6 +3575,26 @@ demux_mkv_fill_buffer (demuxer_t *demuxer, demux_stream_t *ds)
l = tmp;
break;
case MATROSKA_ID_SIMPLEBLOCK:
{
int res;
block_length = ebml_read_length (s, &tmp);
block = (uint8_t *) malloc (block_length);
demuxer->filepos = stream_tell (s);
if (stream_read (s,block,block_length) != (int) block_length)
return 0;
l = tmp + block_length;
res = handle_block (demuxer, block, block_length,
block_duration, block_bref, block_fref, 1);
free (block);
mkv_d->cluster_size -= l + il;
if (res < 0)
return 0;
else if (res)
return 1;
else mkv_d->cluster_size += l + il;
break;
}
case EBML_ID_INVALID:
return 0;

1
libmpdemux/ebml.h
View File

@ -138,6 +138,7 @@
/* IDs in the blockgroup master */
#define MATROSKA_ID_BLOCKDURATION 0x9B
#define MATROSKA_ID_BLOCK 0xA1
#define MATROSKA_ID_SIMPLEBLOCK 0xA3
#define MATROSKA_ID_REFERENCEBLOCK 0xFB
/* IDs in the attachments master */