[FFmpeg-soc] [soc]: r667 - matroska/matroskaenc.c
conrad
subversion at mplayerhq.hu
Fri Aug 10 01:37:26 CEST 2007
Author: conrad
Date: Fri Aug 10 01:37:26 2007
New Revision: 667
Log:
Move calculating the bytes needed to represent a size in EBML to its own function
Modified:
matroska/matroskaenc.c
Modified: matroska/matroskaenc.c
==============================================================================
--- matroska/matroskaenc.c (original)
+++ matroska/matroskaenc.c Fri Aug 10 01:37:26 2007
@@ -96,11 +96,21 @@ static void put_ebml_size_unknown(ByteIO
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
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);
More information about the FFmpeg-soc
mailing list