frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavcodec / rle.c

diff --git a/libavcodec/rle.c b/libavcodec/rle.c
index acbd1f42fb2ff85b324418443dfd45d58cda00e6..6e468f8991e00b49d67dda7a8366b9a266f28dbe 100644 (file)
--- a/libavcodec/rle.c
+++ b/libavcodec/rle.c
@@ -17,7 +17,6 @@
  * 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
- *
  */
 #include "avcodec.h"
 #include "rle.h"
@@ -36,12 +35,12 @@ static int 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(128, len); pos += bpp, count ++) {
+    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(128, len) && *pos != *(pos+1))
+                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,
@@ -55,7 +54,8 @@ static int 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, int8_t add, uint8_t xor)
+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;
@@ -64,15 +64,15 @@ int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, i
         /* see if we can encode the next set of pixels with RLE */
         if((count = count_pixels(ptr, w-x, bpp, 1)) > 1) {
             if(out + bpp + 1 > outbuf + out_size) return -1;
-            *out++ = (count ^ xor) + add;
+            *out++ = (count ^ xor_rep) + add_rep;
             memcpy(out, ptr, bpp);
             out += bpp;
         } else {
             /* fall back on uncompressed */
             count = count_pixels(ptr, w-x, bpp, 0);
-            *out++ = count - 1;
+            if(out + bpp*count >= outbuf + out_size) return -1;
+            *out++ = (count ^ xor_raw) + add_raw;
 
-            if(out + bpp*count > outbuf + out_size) return -1;
             memcpy(out, ptr, bpp * count);
             out += bpp * count;
         }