diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-06-26 20:08:56 -0400 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-06-29 15:25:42 -0400 |
commit | eeb6849cedac099d41feb482da581f4059c63ca7 (patch) | |
tree | c6b1f1fc71bd58cb53af7c176947655131bbe687 | |
parent | 326d9116936ab61d13ac4142b49c7337daf7c4c0 (diff) | |
download | ffmpeg-streaming-eeb6849cedac099d41feb482da581f4059c63ca7.zip ffmpeg-streaming-eeb6849cedac099d41feb482da581f4059c63ca7.tar.gz |
rle: K&R formatting cosmetics
-rw-r--r-- | libavcodec/rle.c | 34 | ||||
-rw-r--r-- | libavcodec/rle.h | 9 |
2 files changed, 25 insertions, 18 deletions
diff --git a/libavcodec/rle.c b/libavcodec/rle.c index 8a2d922..6c8bf27 100644 --- a/libavcodec/rle.c +++ b/libavcodec/rle.c @@ -18,26 +18,29 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/common.h" + #include "avcodec.h" #include "rle.h" -#include "libavutil/common.h" int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same) { const uint8_t *pos; int count = 1; - for(pos = start + bpp; count < FFMIN(127, len); pos += bpp, count ++) { - if(same != !memcmp(pos-bpp, pos, bpp)) { - if(!same) { - /* if bpp == 1, then 0 1 1 0 is more efficiently encoded as a single - * raw block of pixels. for larger bpp, RLE is as good or better */ - if(bpp == 1 && count + 1 < FFMIN(127, len) && *pos != *(pos+1)) + for (pos = start + bpp; count < FFMIN(127, len); pos += bpp, count++) { + if (same != !memcmp(pos - bpp, pos, bpp)) { + if (!same) { + /* if bpp == 1, then 0 1 1 0 is more efficiently encoded as a + * single raw block of pixels. For larger bpp, RLE is as good + * or better */ + if (bpp == 1 && count + 1 < FFMIN(127, len) && *pos != *(pos + 1)) continue; /* if RLE can encode the next block better than as a raw block, * back up and leave _all_ the identical pixels for RLE */ - count --; + count--; } break; } @@ -46,25 +49,28 @@ int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same) return count; } -int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, int w, - int add_rep, int xor_rep, int add_raw, int xor_raw) +int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr, int bpp, + int w, int add_rep, int xor_rep, int add_raw, int xor_raw) { int count, x; uint8_t *out = outbuf; - for(x = 0; x < w; x += count) { + for (x = 0; x < w; x += count) { /* see if we can encode the next set of pixels with RLE */ if ((count = ff_rle_count_pixels(ptr, w - x, bpp, 1)) > 1) { - if(out + bpp + 1 > outbuf + out_size) return -1; + if (out + bpp + 1 > outbuf + out_size) + return -1; + *out++ = (count ^ xor_rep) + add_rep; memcpy(out, ptr, bpp); out += bpp; } else { /* fall back on uncompressed */ count = ff_rle_count_pixels(ptr, w - x, bpp, 0); - if(out + bpp*count >= outbuf + out_size) return -1; - *out++ = (count ^ xor_raw) + add_raw; + if (out + bpp * count >= outbuf + out_size) + return -1; + *out++ = (count ^ xor_raw) + add_raw; memcpy(out, ptr, bpp * count); out += bpp * count; } diff --git a/libavcodec/rle.h b/libavcodec/rle.h index c967764..f1b0c78 100644 --- a/libavcodec/rle.h +++ b/libavcodec/rle.h @@ -35,8 +35,9 @@ int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same); /** - * RLE compress the row, with maximum size of out_size. Value before repeated bytes is (count ^ xor_rep) + add_rep. - * Value before raw bytes is (count ^ xor_raw) + add_raw. + * RLE compress the row, with maximum size of out_size. + * Value before repeated bytes is (count ^ xor_rep) + add_rep. + * Value before raw bytes is (count ^ xor_raw) + add_raw. * @param outbuf Output buffer * @param out_size Maximum output size * @param inbuf Input buffer @@ -44,7 +45,7 @@ int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same); * @param w Image width * @return Size of output in bytes, or -1 if larger than out_size */ -int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *inbuf, int bpp, int w, - int add_rep, int xor_rep, int add_raw, int xor_raw); +int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *inbuf, int bpp, + int w, int add_rep, int xor_rep, int add_raw, int xor_raw); #endif /* AVCODEC_RLE_H */ |