MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move calculating the bytes needed to represent a size in EBML to its own function

Browse Source 
Originally committed as revision 10353 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:24:42 +00:00
parent 9f38fd7efa
commit 1c73478c8e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/matroskaenc.c
View File

@ -96,11 +96,21 @@ static void put_ebml_size_unknown(ByteIOContext *pb, int bytes)
put_byte(pb, value >> i*8);
}
/**
* Calculate how many bytes are needed to represent a given size in EBML
*/
static int ebml_size_bytes(uint64_t size)
{
int bytes = 1;
while ((size+1) >> bytes*7) bytes++;
return bytes;
}
// XXX: test this thoroughly and get rid of minbytes hack (currently needed to
// use up all of the space reserved in start_ebml_master)
static void put_ebml_size(ByteIOContext *pb, uint64_t size, int minbytes)
{
int i, bytes = minbytes;
int i, bytes = FFMAX(minbytes, ebml_size_bytes(size));
// sizes larger than this are currently undefined in EBML
// so write "unknown" size
@ -109,8 +119,6 @@ static void put_ebml_size(ByteIOContext *pb, uint64_t size, int minbytes)
return;
}
while ((size+1) >> bytes*7) bytes++;
put_byte(pb, (0x80 >> (bytes-1)) | (size >> (bytes-1)*8));
for (i = bytes - 2; i >= 0; i--)
put_byte(pb, size >> i*8);