/*****************************************************************************
- * matroska_ebml.c:
+ * matroska_ebml.c: matroska muxer utilities
*****************************************************************************
- * Copyright (C) 2005 Mike Matsnev
+ * Copyright (C) 2005-2014 x264 project
+ *
+ * Authors: Mike Matsnev <mike@haali.su>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@x264.com.
*****************************************************************************/
-#include "muxers.h"
+#include "output.h"
#include "matroska_ebml.h"
#define CLSIZE 1048576
int64_t def_duration;
int64_t timescale;
int64_t cluster_tc_scaled;
- int64_t frame_tc, prev_frame_tc_scaled, max_frame_tc;
+ int64_t frame_tc, max_frame_tc;
- char wrote_header, in_frame, keyframe;
+ char wrote_header, in_frame, keyframe, skippable;
};
static mk_context *mk_create_context( mk_writer *w, mk_context *parent, unsigned id )
}
else
{
- c = malloc( sizeof(*c) );
+ c = calloc( 1, sizeof(mk_context) );
if( !c )
return NULL;
- memset( c, 0, sizeof(*c) );
}
c->parent = parent;
static void mk_destroy_contexts( mk_writer *w )
{
- mk_context *cur, *next;
+ mk_context *next;
- for( cur = w->freelist; cur; cur = next )
+ for( mk_context *cur = w->freelist; cur; cur = next )
{
next = cur->next;
free( cur->data );
free( cur );
}
- for( cur = w->actlist; cur; cur = next )
+ for( mk_context *cur = w->actlist; cur; cur = next )
{
next = cur->next;
free( cur->data );
return 0;
}
-static int mk_write_sint( mk_context *c, unsigned id, int64_t si )
-{
- unsigned char c_si[8] = { si >> 56, si >> 48, si >> 40, si >> 32, si >> 24, si >> 16, si >> 8, si };
- unsigned i = 0;
-
- CHECK( mk_write_id( c, id ) );
- if( si < 0 )
- while( i < 7 && c_si[i] == 0xff && c_si[i+1] & 0x80 )
- ++i;
- else
- while( i < 7 && c_si[i] == 0 && !(c_si[i+1] & 0x80 ) )
- ++i;
- CHECK( mk_write_size( c, 8 - i ) );
- CHECK( mk_append_context_data( c, c_si+i, 8 - i ) );
- return 0;
-}
-
static int mk_write_float_raw( mk_context *c, float f )
{
union
return 0;
}
-static unsigned mk_ebml_size_size( unsigned s )
-{
- if( s < 0x7f )
- return 1;
- if( s < 0x3fff )
- return 2;
- if( s < 0x1fffff )
- return 3;
- if( s < 0x0fffffff )
- return 4;
- return 5;
-}
-
-static unsigned mk_ebml_sint_size( int64_t si )
-{
- unsigned char c_si[8] = { si >> 56, si >> 48, si >> 40, si >> 32, si >> 24, si >> 16, si >> 8, si };
- unsigned i = 0;
-
- if( si < 0 )
- while( i < 7 && c_si[i] == 0xff && c_si[i+1] & 0x80 )
- ++i;
- else
- while( i < 7 && c_si[i] == 0 && !(c_si[i+1] & 0x80) )
- ++i;
-
- return 8 - i;
-}
-
mk_writer *mk_create_writer( const char *filename )
{
- mk_writer *w = malloc( sizeof(*w) );
+ mk_writer *w = calloc( 1, sizeof(mk_writer) );
if( !w )
return NULL;
- memset( w, 0, sizeof(*w) );
-
w->root = mk_create_context( w, NULL, 0 );
if( !w->root )
{
if( !strcmp( filename, "-" ) )
w->fp = stdout;
else
- w->fp = fopen( filename, "wb" );
+ w->fp = x264_fopen( filename, "wb" );
if( !w->fp )
{
mk_destroy_contexts( w );
return w;
}
-int mk_writeHeader( mk_writer *w, const char *writing_app,
- const char *codec_id,
- const void *codec_private, unsigned codec_private_size,
- int64_t default_frame_duration,
- int64_t timescale,
- unsigned width, unsigned height,
- unsigned d_width, unsigned d_height )
+static const uint8_t mk_stereo_modes[6] = {5,9,7,1,3,13};
+
+int mk_write_header( mk_writer *w, const char *writing_app,
+ const char *codec_id,
+ const void *codec_private, unsigned codec_private_size,
+ int64_t default_frame_duration,
+ int64_t timescale,
+ unsigned width, unsigned height,
+ unsigned d_width, unsigned d_height, int display_size_units, int stereo_mode )
{
mk_context *c, *ti, *v;
CHECK( mk_write_uint( c, 0x42f2, 4 ) ); // EBMLMaxIDLength
CHECK( mk_write_uint( c, 0x42f3, 8 ) ); // EBMLMaxSizeLength
CHECK( mk_write_string( c, 0x4282, "matroska") ); // DocType
- CHECK( mk_write_uint( c, 0x4287, 1 ) ); // DocTypeVersion
- CHECK( mk_write_uint( c, 0x4285, 1 ) ); // DocTypeReadversion
+ CHECK( mk_write_uint( c, 0x4287, 2 ) ); // DocTypeVersion
+ CHECK( mk_write_uint( c, 0x4285, 2 ) ); // DocTypeReadversion
CHECK( mk_close_context( c, 0 ) );
if( !(c = mk_create_context( w, w->root, 0x18538067 )) ) // Segment
return -1;
CHECK( mk_write_uint( v, 0xb0, width ) );
CHECK( mk_write_uint( v, 0xba, height ) );
+ CHECK( mk_write_uint( v, 0x54b2, display_size_units ) );
CHECK( mk_write_uint( v, 0x54b0, d_width ) );
CHECK( mk_write_uint( v, 0x54ba, d_height ) );
+ if( stereo_mode >= 0 && stereo_mode <= 5 )
+ CHECK( mk_write_uint( v, 0x53b8, mk_stereo_modes[stereo_mode] ) );
CHECK( mk_close_context( v, 0 ) );
CHECK( mk_close_context( ti, 0 ) );
static int mk_flush_frame( mk_writer *w )
{
- int64_t delta, ref = 0;
- unsigned fsize, bgsize;
+ int64_t delta;
+ unsigned fsize;
unsigned char c_delta_flags[3];
if( !w->in_frame )
}
fsize = w->frame ? w->frame->d_cur : 0;
- bgsize = fsize + 4 + mk_ebml_size_size( fsize + 4 ) + 1;
- if( !w->keyframe )
- {
- ref = w->prev_frame_tc_scaled - w->cluster_tc_scaled - delta;
- bgsize += 1 + 1 + mk_ebml_sint_size( ref );
- }
- CHECK( mk_write_id( w->cluster, 0xa0 ) ); // BlockGroup
- CHECK( mk_write_size( w->cluster, bgsize ) );
- CHECK( mk_write_id( w->cluster, 0xa1 ) ); // Block
+ CHECK( mk_write_id( w->cluster, 0xa3 ) ); // SimpleBlock
CHECK( mk_write_size( w->cluster, fsize + 4 ) );
CHECK( mk_write_size( w->cluster, 1 ) ); // track number
c_delta_flags[0] = delta >> 8;
c_delta_flags[1] = delta;
- c_delta_flags[2] = 0;
+ c_delta_flags[2] = (w->keyframe << 7) | w->skippable;
CHECK( mk_append_context_data( w->cluster, c_delta_flags, 3 ) );
if( w->frame )
{
CHECK( mk_append_context_data( w->cluster, w->frame->data, w->frame->d_cur ) );
w->frame->d_cur = 0;
}
- if( !w->keyframe )
- CHECK( mk_write_sint( w->cluster, 0xfb, ref ) ); // ReferenceBlock
w->in_frame = 0;
- w->prev_frame_tc_scaled = w->cluster_tc_scaled + delta;
if( w->cluster->d_cur > CLSIZE )
CHECK( mk_close_cluster( w ) );
if( mk_flush_frame( w ) < 0 )
return -1;
- w->in_frame = 1;
- w->keyframe = 0;
+ w->in_frame = 1;
+ w->keyframe = 0;
+ w->skippable = 0;
return 0;
}
-int mk_set_frame_flags( mk_writer *w, int64_t timestamp, int keyframe )
+int mk_set_frame_flags( mk_writer *w, int64_t timestamp, int keyframe, int skippable )
{
if( !w->in_frame )
return -1;
- w->frame_tc = timestamp;
- w->keyframe = keyframe != 0;
+ w->frame_tc = timestamp;
+ w->keyframe = keyframe != 0;
+ w->skippable = skippable != 0;
if( w->max_frame_tc < timestamp )
w->max_frame_tc = timestamp;
return mk_append_context_data( w->frame, data, size );
}
-int mk_close( mk_writer *w )
+int mk_close( mk_writer *w, int64_t last_delta )
{
int ret = 0;
if( mk_flush_frame( w ) < 0 || mk_close_cluster( w ) < 0 )
if( w->wrote_header && x264_is_regular_file( w->fp ) )
{
fseek( w->fp, w->duration_ptr, SEEK_SET );
- if( mk_write_float_raw( w->root, (float)((double)(w->max_frame_tc+w->def_duration) / w->timescale) ) < 0 ||
+ int64_t last_frametime = w->def_duration ? w->def_duration : last_delta;
+ int64_t total_duration = w->max_frame_tc+last_frametime;
+ if( mk_write_float_raw( w->root, (float)((double)total_duration / w->timescale) ) < 0 ||
mk_flush_context_data( w->root ) < 0 )
ret = -1;
}
projects / x264 / blobdiff