Mercurial > libavformat.hg
changeset 4469:49cf858ac430 libavformat
encode klv fill item length in fixed ber 4 bytes
| author | bcoudurier |
|---|---|
| date | Fri, 13 Feb 2009 05:33:11 +0000 |
| parents | d23db4a449ed |
| children | 1c6dd9d7a634 |
| files | mxfenc.c |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mxfenc.c Fri Feb 13 03:51:15 2009 +0000 +++ b/mxfenc.c Fri Feb 13 05:33:11 2009 +0000 @@ -289,6 +289,12 @@ return 0; } +static void klv_encode_ber4_length(ByteIOContext *pb, int len) +{ + put_byte(pb, 0x80 + 3); + put_be24(pb, len); +} + /* * Get essence container ul index */ @@ -928,7 +934,7 @@ static unsigned klv_fill_size(uint64_t size) { unsigned pad = KAG_SIZE - (size & (KAG_SIZE-1)); - if (pad < 17) // smallest fill item possible + if (pad < 20) // smallest fill item possible return pad + KAG_SIZE; else return pad & (KAG_SIZE-1); @@ -1061,11 +1067,8 @@ unsigned pad = klv_fill_size(url_ftell(s->pb)); if (pad) { put_buffer(s->pb, klv_fill_key, 16); - pad -= 16; - pad -= klv_ber_length(pad); - klv_encode_ber_length(s->pb, pad); - for (; pad > 7; pad -= 8) - put_be64(s->pb, 0); + pad -= 16 + 4; + klv_encode_ber4_length(s->pb, pad); for (; pad; pad--) put_byte(s->pb, 0); assert(!(url_ftell(s->pb) & (KAG_SIZE-1)));