virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

rle: K&R formatting cosmetics

Browse Source
This commit is contained in:
Vittorio Giovara 2016-06-26 20:08:56 -04:00
parent 326d911693
commit eeb6849ced
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/rle.c
View File

@ -18,9 +18,11 @@
* License along with Libav; if not, write to the Free Software * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/common.h"
#include "avcodec.h" #include "avcodec.h"
#include "rle.h" #include "rle.h"
#include "libavutil/common.h"
int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same) int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same)
{ {
@ -30,8 +32,9 @@ int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same)
for (pos = start + bpp; count < FFMIN(127, len); pos += bpp, count++) { for (pos = start + bpp; count < FFMIN(127, len); pos += bpp, count++) {
if (same != !memcmp(pos - bpp, pos, bpp)) { if (same != !memcmp(pos - bpp, pos, bpp)) {
if (!same) { if (!same) {
/* if bpp == 1, then 0 1 1 0 is more efficiently encoded as a single /* if bpp == 1, then 0 1 1 0 is more efficiently encoded as a
* raw block of pixels. for larger bpp, RLE is as good or better */ * 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)) if (bpp == 1 && count + 1 < FFMIN(127, len) && *pos != *(pos + 1))
continue; continue;
@ -46,8 +49,8 @@ int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same)
return count; return count;
} }
int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, int w, int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr, int bpp,
int add_rep, int xor_rep, int add_raw, int xor_raw) int w, int add_rep, int xor_rep, int add_raw, int xor_raw)
{ {
int count, x; int count, x;
uint8_t *out = outbuf; uint8_t *out = outbuf;
@ -55,16 +58,19 @@ int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, i
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 */ /* 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 ((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; *out++ = (count ^ xor_rep) + add_rep;
memcpy(out, ptr, bpp); memcpy(out, ptr, bpp);
out += bpp; out += bpp;
} else { } else {
/* fall back on uncompressed */ /* fall back on uncompressed */
count = ff_rle_count_pixels(ptr, w - x, bpp, 0); count = ff_rle_count_pixels(ptr, w - x, bpp, 0);
if(out + bpp*count >= outbuf + out_size) return -1; if (out + bpp * count >= outbuf + out_size)
*out++ = (count ^ xor_raw) + add_raw; return -1;
*out++ = (count ^ xor_raw) + add_raw;
memcpy(out, ptr, bpp * count); memcpy(out, ptr, bpp * count);
out += bpp * count; out += bpp * count;
} }

7
libavcodec/rle.h
View File

@ -35,7 +35,8 @@
int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same); 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. * 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. * Value before raw bytes is (count ^ xor_raw) + add_raw.
* @param outbuf Output buffer * @param outbuf Output buffer
* @param out_size Maximum output size * @param out_size Maximum output size
@ -44,7 +45,7 @@ int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same);
* @param w Image width * @param w Image width
* @return Size of output in bytes, or -1 if larger than out_size * @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 ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *inbuf, int bpp,
int add_rep, int xor_rep, int add_raw, int xor_raw); int w, int add_rep, int xor_rep, int add_raw, int xor_raw);
#endif /* AVCODEC_RLE_H */ #endif /* AVCODEC_RLE_H */