Mercurial > libavcodec.hg
view bytestream.h @ 4829:e3161603a048 libavcodec
Remove a NAL unit's trailing zero bytes even when dst_length is 1.
Consider the following byte sequence
00 00 01 0a 00 00 00 01 09 ...
^ ^
A B
decode_nal() determines dst_length to be 1 (i. e. the byte between label
A and B above). However, this byte is a trailing zero byte as the spec
says the the current NAL unit is terminated by a byte sequence 00 00 00.
The current code used a loop to decrement dst_length accordingly. But the
loop doesn't start as the loop condition checks for dst_length > 1, which
should read dst_length > 0.
patch by Reinhard Nissl, rnissl gmx de
author | diego |
---|---|
date | Mon, 09 Apr 2007 13:39:35 +0000 |
parents | d25576b9b50c |
children | e92146cec4a8 |
line wrap: on
line source
/* * Bytestream functions * copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@free.fr> * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef FFMPEG_BYTESTREAM_H #define FFMPEG_BYTESTREAM_H #define DEF(name, bytes, read, write)\ static av_always_inline unsigned int bytestream_get_ ## name(uint8_t **b){\ (*b) += bytes;\ return read(*b - bytes);\ }\ static av_always_inline void bytestream_put_ ##name(uint8_t **b, const unsigned int value){\ write(*b, value);\ (*b) += bytes;\ }; DEF(le32, 4, AV_RL32, AV_WL32) DEF(le24, 3, AV_RL24, AV_WL24) DEF(le16, 2, AV_RL16, AV_WL16) DEF(be32, 4, AV_RB32, AV_WB32) DEF(be24, 3, AV_RB24, AV_WB24) DEF(be16, 2, AV_RB16, AV_WB16) DEF(byte, 1, AV_RB8 , AV_WB8 ) #undef DEF static av_always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size) { memcpy(dst, *b, size); (*b) += size; return size; } static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *src, unsigned int size) { memcpy(*b, src, size); (*b) += size; } #endif /* FFMPEG_BYTESTREAM_H */