Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Calculate the size of a SimpleBlock before writing it so that bytes aren't wasted in writing the size

Browse source 
Originally committed as revision 10318 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:23:23 +00:00
parent 7973dd0bf1
commit 4d1fd70cac
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libavformat/matroskaenc.c
View file

@ -428,7 +428,6 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
{
MatroskaMuxContext *mkv = s->priv_data;
ByteIOContext *pb = &s->pb;
offset_t block;
// start a new cluster every 5 MB or 5 sec
if (url_ftell(pb) > mkv->cluster + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
@ -442,12 +441,12 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
mkv->cluster_pts = pkt->pts;
}
block = start_ebml_master(pb, MATROSKA_ID_SIMPLEBLOCK);
put_ebml_id(pb, MATROSKA_ID_SIMPLEBLOCK);
put_ebml_size(pb, pkt->size + 4, 0);
put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126
put_be16(pb, pkt->pts - mkv->cluster_pts);
put_byte(pb, !!(pkt->flags & PKT_FLAG_KEY));
put_buffer(pb, pkt->data, pkt->size);
end_ebml_master(pb, block);
mkv->duration = pkt->pts + pkt->duration;
return 0;