virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rpza: switch to bytestream2

Browse Source
This commit is contained in:
Anton Khirnov 2014-01-08 13:58:38 +01:00
parent 394fb56c29
commit e1218ce914
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libavcodec/rpza.c
View File

@ -39,8 +39,8 @@
#include <string.h> #include <string.h>
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h"
#include "internal.h" #include "internal.h"
typedef struct RpzaContext { typedef struct RpzaContext {
@ -48,9 +48,7 @@ typedef struct RpzaContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame *frame; AVFrame *frame;
const unsigned char *buf; GetByteContext gb;
int size;
} RpzaContext; } RpzaContext;
#define ADVANCE_BLOCK() \ #define ADVANCE_BLOCK() \
@ -74,7 +72,6 @@ static void rpza_decode_stream(RpzaContext *s)
int width = s->avctx->width; int width = s->avctx->width;
int stride = s->frame->linesize[0] / 2; int stride = s->frame->linesize[0] / 2;
int row_inc = stride - 4; int row_inc = stride - 4;
int stream_ptr = 0;
int chunk_size; int chunk_size;
unsigned char opcode; unsigned char opcode;
int n_blocks; int n_blocks;
@ -91,34 +88,31 @@ static void rpza_decode_stream(RpzaContext *s)
int total_blocks; int total_blocks;
/* First byte is always 0xe1. Warn if it's different */ /* First byte is always 0xe1. Warn if it's different */
if (s->buf[stream_ptr] != 0xe1) if (bytestream2_peek_byte(&s->gb) != 0xe1)
av_log(s->avctx, AV_LOG_ERROR, "First chunk byte is 0x%02x instead of 0xe1\n", av_log(s->avctx, AV_LOG_ERROR, "First chunk byte is 0x%02x instead of 0xe1\n",
s->buf[stream_ptr]); bytestream2_peek_byte(&s->gb));
/* Get chunk size, ingnoring first byte */ /* Get chunk size, ingnoring first byte */
chunk_size = AV_RB32(&s->buf[stream_ptr]) & 0x00FFFFFF; chunk_size = bytestream2_get_be32(&s->gb) & 0x00FFFFFF;
stream_ptr += 4;
/* If length mismatch use size from MOV file and try to decode anyway */ /* If length mismatch use size from MOV file and try to decode anyway */
if (chunk_size != s->size) if (chunk_size != bytestream2_get_bytes_left(&s->gb) - 4)
av_log(s->avctx, AV_LOG_ERROR, "MOV chunk size != encoded chunk size; using MOV chunk size\n"); av_log(s->avctx, AV_LOG_WARNING, "MOV chunk size != encoded chunk size\n");
chunk_size = s->size;
/* Number of 4x4 blocks in frame. */ /* Number of 4x4 blocks in frame. */
total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4); total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
/* Process chunk data */ /* Process chunk data */
while (stream_ptr < chunk_size) { while (bytestream2_get_bytes_left(&s->gb)) {
opcode = s->buf[stream_ptr++]; /* Get opcode */ opcode = bytestream2_get_byte(&s->gb); /* Get opcode */
n_blocks = (opcode & 0x1f) + 1; /* Extract block counter from opcode */ n_blocks = (opcode & 0x1f) + 1; /* Extract block counter from opcode */
/* If opcode MSbit is 0, we need more data to decide what to do */ /* If opcode MSbit is 0, we need more data to decide what to do */
if ((opcode & 0x80) == 0) { if ((opcode & 0x80) == 0) {
colorA = (opcode << 8) | (s->buf[stream_ptr++]); colorA = (opcode << 8) | bytestream2_get_byte(&s->gb);
opcode = 0; opcode = 0;
if ((s->buf[stream_ptr] & 0x80) != 0) { if ((bytestream2_peek_byte(&s->gb) & 0x80) != 0) {
/* Must behave as opcode 110xxxxx, using colorA computed /* Must behave as opcode 110xxxxx, using colorA computed
* above. Use fake opcode 0x20 to enter switch block at * above. Use fake opcode 0x20 to enter switch block at
* the right place */ * the right place */
@ -138,8 +132,7 @@ static void rpza_decode_stream(RpzaContext *s)
/* Fill blocks with one color */ /* Fill blocks with one color */
case 0xa0: case 0xa0:
colorA = AV_RB16 (&s->buf[stream_ptr]); colorA = bytestream2_get_be16(&s->gb);
stream_ptr += 2;
while (n_blocks--) { while (n_blocks--) {
block_ptr = row_ptr + pixel_ptr; block_ptr = row_ptr + pixel_ptr;
for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_y = 0; pixel_y < 4; pixel_y++) {
@ -155,11 +148,9 @@ static void rpza_decode_stream(RpzaContext *s)
/* Fill blocks with 4 colors */ /* Fill blocks with 4 colors */
case 0xc0: case 0xc0:
colorA = AV_RB16 (&s->buf[stream_ptr]); colorA = bytestream2_get_be16(&s->gb);
stream_ptr += 2;
case 0x20: case 0x20:
colorB = AV_RB16 (&s->buf[stream_ptr]); colorB = bytestream2_get_be16(&s->gb);
stream_ptr += 2;
/* sort out the colors */ /* sort out the colors */
color4[0] = colorB; color4[0] = colorB;
@ -185,12 +176,12 @@ static void rpza_decode_stream(RpzaContext *s)
color4[1] |= ((11 * ta + 21 * tb) >> 5); color4[1] |= ((11 * ta + 21 * tb) >> 5);
color4[2] |= ((21 * ta + 11 * tb) >> 5); color4[2] |= ((21 * ta + 11 * tb) >> 5);
if (s->size - stream_ptr < n_blocks * 4) if (bytestream2_get_bytes_left(&s->gb) < n_blocks * 4)
return; return;
while (n_blocks--) { while (n_blocks--) {
block_ptr = row_ptr + pixel_ptr; block_ptr = row_ptr + pixel_ptr;
for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_y = 0; pixel_y < 4; pixel_y++) {
index = s->buf[stream_ptr++]; index = bytestream2_get_byteu(&s->gb);
for (pixel_x = 0; pixel_x < 4; pixel_x++){ for (pixel_x = 0; pixel_x < 4; pixel_x++){
idx = (index >> (2 * (3 - pixel_x))) & 0x03; idx = (index >> (2 * (3 - pixel_x))) & 0x03;
pixels[block_ptr] = color4[idx]; pixels[block_ptr] = color4[idx];
@ -204,16 +195,14 @@ static void rpza_decode_stream(RpzaContext *s)
/* Fill block with 16 colors */ /* Fill block with 16 colors */
case 0x00: case 0x00:
if (s->size - stream_ptr < 30) if (bytestream2_get_bytes_left(&s->gb) < 30)
return; return;
block_ptr = row_ptr + pixel_ptr; block_ptr = row_ptr + pixel_ptr;
for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_y = 0; pixel_y < 4; pixel_y++) {
for (pixel_x = 0; pixel_x < 4; pixel_x++){ for (pixel_x = 0; pixel_x < 4; pixel_x++){
/* We already have color of upper left pixel */ /* We already have color of upper left pixel */
if ((pixel_y != 0) || (pixel_x !=0)) { if ((pixel_y != 0) || (pixel_x != 0))
colorA = AV_RB16 (&s->buf[stream_ptr]); colorA = bytestream2_get_be16u(&s->gb);
stream_ptr += 2;
}
pixels[block_ptr] = colorA; pixels[block_ptr] = colorA;
block_ptr++; block_ptr++;
} }
@ -226,7 +215,7 @@ static void rpza_decode_stream(RpzaContext *s)
default: default:
av_log(s->avctx, AV_LOG_ERROR, "Unknown opcode %d in rpza chunk." av_log(s->avctx, AV_LOG_ERROR, "Unknown opcode %d in rpza chunk."
" Skip remaining %d bytes of chunk data.\n", opcode, " Skip remaining %d bytes of chunk data.\n", opcode,
chunk_size - stream_ptr); bytestream2_get_bytes_left(&s->gb));
return; return;
} /* Opcode switch */ } /* Opcode switch */
} }
@ -250,13 +239,10 @@ static int rpza_decode_frame(AVCodecContext *avctx,
void *data, int *got_frame, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
RpzaContext *s = avctx->priv_data; RpzaContext *s = avctx->priv_data;
int ret; int ret;
s->buf = buf; bytestream2_init(&s->gb, avpkt->data, avpkt->size);
s->size = buf_size;
if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) { if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
@ -271,7 +257,7 @@ static int rpza_decode_frame(AVCodecContext *avctx,
*got_frame = 1; *got_frame = 1;
/* always report that the buffer was completely consumed */ /* always report that the buffer was completely consumed */
return buf_size; return avpkt->size;
} }
static av_cold int rpza_decode_end(AVCodecContext *avctx) static av_cold int rpza_decode_end(AVCodecContext *avctx)