[FFmpeg-cvslog] msrle: convert MS RLE decoding function to bytestream2.
Ronald Bultje
git at videolan.org
Sun Apr 7 15:54:21 CEST 2013
ffmpeg | branch: release/0.10 | Ronald Bultje <rsbultje at gmail.com> | Sat Mar 31 17:10:54 2012 +0000| [327ff82bac3081d918dceb4931c77e25d0a1480d] | committer: Reinhard Tartler
msrle: convert MS RLE decoding function to bytestream2.
Signed-off-by: Justin Ruggles <justin.ruggles at gmail.com>
(cherry picked from commit 992f71e95dcf57c917531f126ba7499ef9ed87d3)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=327ff82bac3081d918dceb4931c77e25d0a1480d
---
libavcodec/aasc.c | 12 ++---
libavcodec/bmp.c | 4 +-
libavcodec/msrle.c | 4 +-
libavcodec/msrledec.c | 129 +++++++++++++++++++++++++------------------------
libavcodec/msrledec.h | 8 +--
libavcodec/tscc.c | 8 ++-
6 files changed, 85 insertions(+), 80 deletions(-)
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 11ea577..f9c60f9 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -34,17 +34,10 @@
typedef struct AascContext {
AVCodecContext *avctx;
+ GetByteContext gb;
AVFrame frame;
} AascContext;
-#define FETCH_NEXT_STREAM_BYTE() \
- if (stream_ptr >= buf_size) \
- { \
- av_log(s->avctx, AV_LOG_ERROR, " AASC: stream ptr just went out of bounds (fetch)\n"); \
- break; \
- } \
- stream_byte = buf[stream_ptr++];
-
static av_cold int aasc_decode_init(AVCodecContext *avctx)
{
AascContext *s = avctx->priv_data;
@@ -84,7 +77,8 @@ static int aasc_decode_frame(AVCodecContext *avctx,
}
break;
case 1:
- ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, buf - 4, buf_size + 4);
+ bytestream2_init(&s->gb, buf - 4, buf_size + 4);
+ ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, &s->gb);
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 974db49..01c6fb0 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -52,6 +52,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
uint8_t *ptr;
int dsize;
const uint8_t *buf0 = buf;
+ GetByteContext gb;
if(buf_size < 14){
av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size);
@@ -265,7 +266,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0];
}
- ff_msrle_decode(avctx, (AVPicture*)p, depth, buf, dsize);
+ bytestream2_init(&gb, buf, dsize);
+ ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb);
if(height < 0){
p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0];
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 41f1fd8..f964392 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -40,6 +40,7 @@ typedef struct MsrleContext {
AVCodecContext *avctx;
AVFrame frame;
+ GetByteContext gb;
const unsigned char *buf;
int size;
@@ -123,7 +124,8 @@ static int msrle_decode_frame(AVCodecContext *avctx,
ptr += s->frame.linesize[0];
}
} else {
- ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);
+ bytestream2_init(&s->gb, buf, buf_size);
+ ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, &s->gb);
}
*data_size = sizeof(AVFrame);
diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c
index 5e33a59..003122e 100644
--- a/libavcodec/msrledec.c
+++ b/libavcodec/msrledec.c
@@ -30,18 +30,9 @@
#include "avcodec.h"
#include "msrledec.h"
-#define FETCH_NEXT_STREAM_BYTE() \
- if (stream_ptr >= data_size) \
- { \
- av_log(avctx, AV_LOG_ERROR, " MS RLE: stream ptr just went out of bounds (1)\n"); \
- return -1; \
- } \
- stream_byte = data[stream_ptr++];
-
static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
- const uint8_t *data, int data_size)
+ GetByteContext *gb)
{
- int stream_ptr = 0;
unsigned char rle_code;
unsigned char extra_byte, odd_pixel;
unsigned char stream_byte;
@@ -52,11 +43,16 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
int i;
while (row_ptr >= 0) {
- FETCH_NEXT_STREAM_BYTE();
- rle_code = stream_byte;
+ if (bytestream2_get_bytes_left(gb) <= 0) {
+ av_log(avctx, AV_LOG_ERROR,
+ "MS RLE: bytestream overrun, %d rows left\n",
+ row_ptr);
+ return AVERROR_INVALIDDATA;
+ }
+ rle_code = stream_byte = bytestream2_get_byteu(gb);
if (rle_code == 0) {
/* fetch the next byte to see how to handle escape code */
- FETCH_NEXT_STREAM_BYTE();
+ stream_byte = bytestream2_get_byte(gb);
if (stream_byte == 0) {
/* line is done, goto the next one */
row_ptr -= row_dec;
@@ -66,24 +62,26 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
return 0;
} else if (stream_byte == 2) {
/* reposition frame decode coordinates */
- FETCH_NEXT_STREAM_BYTE();
+ stream_byte = bytestream2_get_byte(gb);
pixel_ptr += stream_byte;
- FETCH_NEXT_STREAM_BYTE();
+ stream_byte = bytestream2_get_byte(gb);
row_ptr -= stream_byte * row_dec;
} else {
// copy pixels from encoded stream
odd_pixel = stream_byte & 1;
rle_code = (stream_byte + 1) / 2;
extra_byte = rle_code & 0x01;
- if (row_ptr + pixel_ptr + stream_byte > frame_size) {
- av_log(avctx, AV_LOG_ERROR, " MS RLE: frame ptr just went out of bounds (1)\n");
- return -1;
+ if (row_ptr + pixel_ptr + stream_byte > frame_size ||
+ bytestream2_get_bytes_left(gb) < rle_code) {
+ av_log(avctx, AV_LOG_ERROR,
+ "MS RLE: frame/stream ptr just went out of bounds (copy)\n");
+ return AVERROR_INVALIDDATA;
}
for (i = 0; i < rle_code; i++) {
if (pixel_ptr >= avctx->width)
break;
- FETCH_NEXT_STREAM_BYTE();
+ stream_byte = bytestream2_get_byteu(gb);
pic->data[0][row_ptr + pixel_ptr] = stream_byte >> 4;
pixel_ptr++;
if (i + 1 == rle_code && odd_pixel)
@@ -96,15 +94,16 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
// if the RLE code is odd, skip a byte in the stream
if (extra_byte)
- stream_ptr++;
+ bytestream2_skip(gb, 1);
}
} else {
// decode a run of data
if (row_ptr + pixel_ptr + stream_byte > frame_size) {
- av_log(avctx, AV_LOG_ERROR, " MS RLE: frame ptr just went out of bounds (1)\n");
- return -1;
+ av_log(avctx, AV_LOG_ERROR,
+ "MS RLE: frame ptr just went out of bounds (run)\n");
+ return AVERROR_INVALIDDATA;
}
- FETCH_NEXT_STREAM_BYTE();
+ stream_byte = bytestream2_get_byte(gb);
for (i = 0; i < rle_code; i++) {
if (pixel_ptr >= avctx->width)
break;
@@ -118,21 +117,21 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
}
/* one last sanity check on the way out */
- if (stream_ptr < data_size) {
- av_log(avctx, AV_LOG_ERROR, " MS RLE: ended frame decode with bytes left over (%d < %d)\n",
- stream_ptr, data_size);
- return -1;
+ if (bytestream2_get_bytes_left(gb)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "MS RLE: ended frame decode with %d bytes left over\n",
+ bytestream2_get_bytes_left(gb));
+ return AVERROR_INVALIDDATA;
}
return 0;
}
-static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int depth,
- const uint8_t *data, int srcsize)
+static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic,
+ int depth, GetByteContext *gb)
{
uint8_t *output, *output_end;
- const uint8_t* src = data;
int p1, p2, line=avctx->height - 1, pos=0, i;
uint16_t av_uninit(pix16);
uint32_t av_uninit(pix32);
@@ -140,23 +139,29 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
output = pic->data[0] + (avctx->height - 1) * pic->linesize[0];
output_end = pic->data[0] + avctx->height * pic->linesize[0];
- while(src < data + srcsize) {
- p1 = *src++;
+ while (bytestream2_get_bytes_left(gb) > 0) {
+ p1 = bytestream2_get_byteu(gb);
if(p1 == 0) { //Escape code
- p2 = *src++;
+ p2 = bytestream2_get_byte(gb);
if(p2 == 0) { //End-of-line
output = pic->data[0] + (--line) * pic->linesize[0];
- if (line < 0 && !(src+1 < data + srcsize && AV_RB16(src) == 1)) {
- av_log(avctx, AV_LOG_ERROR, "Next line is beyond picture bounds\n");
- return -1;
+ if (line < 0) {
+ if (bytestream2_get_be16(gb) == 1) { // end-of-picture
+ return 0;
+ } else {
+ av_log(avctx, AV_LOG_ERROR,
+ "Next line is beyond picture bounds (%d bytes left)\n",
+ bytestream2_get_bytes_left(gb));
+ return AVERROR_INVALIDDATA;
+ }
}
pos = 0;
continue;
} else if(p2 == 1) { //End-of-picture
return 0;
} else if(p2 == 2) { //Skip
- p1 = *src++;
- p2 = *src++;
+ p1 = bytestream2_get_byte(gb);
+ p2 = bytestream2_get_byte(gb);
line -= p2;
pos += p1;
if (line < 0 || pos >= width){
@@ -167,31 +172,31 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
continue;
}
// Copy data
- if ((pic->linesize[0] > 0 && output + p2 * (depth >> 3) > output_end)
- ||(pic->linesize[0] < 0 && output + p2 * (depth >> 3) < output_end)) {
- src += p2 * (depth >> 3);
+ if ((pic->linesize[0] > 0 && output + p2 * (depth >> 3) > output_end) ||
+ (pic->linesize[0] < 0 && output + p2 * (depth >> 3) < output_end)) {
+ bytestream2_skip(gb, 2 * (depth >> 3));
continue;
+ } else if (bytestream2_get_bytes_left(gb) < p2 * (depth >> 3)) {
+ av_log(avctx, AV_LOG_ERROR, "bytestream overrun\n");
+ return AVERROR_INVALIDDATA;
}
+
if ((depth == 8) || (depth == 24)) {
for(i = 0; i < p2 * (depth >> 3); i++) {
- *output++ = *src++;
+ *output++ = bytestream2_get_byteu(gb);
}
// RLE8 copy is actually padded - and runs are not!
if(depth == 8 && (p2 & 1)) {
- src++;
+ bytestream2_skip(gb, 1);
}
} else if (depth == 16) {
for(i = 0; i < p2; i++) {
- pix16 = AV_RL16(src);
- src += 2;
- *(uint16_t*)output = pix16;
+ *(uint16_t*)output = bytestream2_get_le16u(gb);
output += 2;
}
} else if (depth == 32) {
for(i = 0; i < p2; i++) {
- pix32 = AV_RL32(src);
- src += 4;
- *(uint32_t*)output = pix32;
+ *(uint32_t*)output = bytestream2_get_le32u(gb);
output += 4;
}
}
@@ -199,21 +204,19 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
} else { //run of pixels
uint8_t pix[3]; //original pixel
switch(depth){
- case 8: pix[0] = *src++;
+ case 8: pix[0] = bytestream2_get_byte(gb);
break;
- case 16: pix16 = AV_RL16(src);
- src += 2;
+ case 16: pix16 = bytestream2_get_le16(gb);
break;
- case 24: pix[0] = *src++;
- pix[1] = *src++;
- pix[2] = *src++;
+ case 24: pix[0] = bytestream2_get_byte(gb);
+ pix[1] = bytestream2_get_byte(gb);
+ pix[2] = bytestream2_get_byte(gb);
break;
- case 32: pix32 = AV_RL32(src);
- src += 4;
+ case 32: pix32 = bytestream2_get_le32(gb);
break;
}
- if ((pic->linesize[0] > 0 && output + p1 * (depth >> 3) > output_end)
- ||(pic->linesize[0] < 0 && output + p1 * (depth >> 3) < output_end))
+ if ((pic->linesize[0] > 0 && output + p1 * (depth >> 3) > output_end) ||
+ (pic->linesize[0] < 0 && output + p1 * (depth >> 3) < output_end))
continue;
for(i = 0; i < p1; i++) {
switch(depth){
@@ -240,17 +243,17 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
}
-int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, int depth,
- const uint8_t* data, int data_size)
+int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic,
+ int depth, GetByteContext *gb)
{
switch(depth){
case 4:
- return msrle_decode_pal4(avctx, pic, data, data_size);
+ return msrle_decode_pal4(avctx, pic, gb);
case 8:
case 16:
case 24:
case 32:
- return msrle_decode_8_16_24_32(avctx, pic, depth, data, data_size);
+ return msrle_decode_8_16_24_32(avctx, pic, depth, gb);
default:
av_log(avctx, AV_LOG_ERROR, "Unknown depth %d\n", depth);
return -1;
diff --git a/libavcodec/msrledec.h b/libavcodec/msrledec.h
index 5bde35a..c167843 100644
--- a/libavcodec/msrledec.h
+++ b/libavcodec/msrledec.h
@@ -23,6 +23,7 @@
#define AVCODEC_MSRLEDEC_H
#include "avcodec.h"
+#include "bytestream.h"
/**
* Decode stream in MS RLE format into frame.
@@ -30,11 +31,10 @@
* @param avctx codec context
* @param pic destination frame
* @param depth bit depth
- * @param data input stream
- * @param data_size input size
+ * @param gb input bytestream context
*/
-int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, int depth,
- const uint8_t* data, int data_size);
+int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic,
+ int depth, GetByteContext *gb);
#endif /* AVCODEC_MSRLEDEC_H */
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index ccf1048..748072f 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -58,6 +58,7 @@ typedef struct TsccContext {
unsigned int decomp_size;
// Decompression buffer
unsigned char* decomp_buf;
+ GetByteContext gb;
int height;
z_stream zstream;
@@ -105,8 +106,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
- if(zret != Z_DATA_ERROR)
- ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->decomp_size - c->zstream.avail_out);
+ if (zret != Z_DATA_ERROR) {
+ bytestream2_init(&c->gb, c->decomp_buf,
+ c->decomp_size - c->zstream.avail_out);
+ ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, &c->gb);
+ }
/* make the palette available on the way out */
if (c->avctx->pix_fmt == PIX_FMT_PAL8) {
More information about the ffmpeg-cvslog
mailing list