diff options
Diffstat (limited to 'libavcodec/rpza.c')
| -rw-r--r-- | libavcodec/rpza.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index 83dde7a9c3..732b09ac94 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -1,21 +1,21 @@ /* * Quicktime Video (RPZA) Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg Project * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -80,7 +80,7 @@ static void rpza_decode_stream(RpzaContext *s) uint16_t *pixels = (uint16_t *)s->frame->data[0]; int row_ptr = 0; - int pixel_ptr = 0; + int pixel_ptr = -4; int block_ptr; int pixel_x, pixel_y; int total_blocks; @@ -94,8 +94,12 @@ static void rpza_decode_stream(RpzaContext *s) chunk_size = bytestream2_get_be32(&s->gb) & 0x00FFFFFF; /* If length mismatch use size from MOV file and try to decode anyway */ - if (chunk_size != bytestream2_get_bytes_left(&s->gb) - 4) - av_log(s->avctx, AV_LOG_WARNING, "MOV chunk size != encoded chunk size\n"); + if (chunk_size != bytestream2_get_bytes_left(&s->gb) + 4) + av_log(s->avctx, AV_LOG_WARNING, + "MOV chunk size %d != encoded chunk size %d\n", + chunk_size, + bytestream2_get_bytes_left(&s->gb) + 4 + ); /* Number of 4x4 blocks in frame. */ total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4); @@ -134,6 +138,7 @@ static void rpza_decode_stream(RpzaContext *s) case 0xa0: colorA = bytestream2_get_be16(&s->gb); while (n_blocks--) { + ADVANCE_BLOCK() block_ptr = row_ptr + pixel_ptr; for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++){ @@ -142,7 +147,6 @@ static void rpza_decode_stream(RpzaContext *s) } block_ptr += row_inc; } - ADVANCE_BLOCK(); } break; @@ -179,6 +183,7 @@ static void rpza_decode_stream(RpzaContext *s) if (bytestream2_get_bytes_left(&s->gb) < n_blocks * 4) return; while (n_blocks--) { + ADVANCE_BLOCK(); block_ptr = row_ptr + pixel_ptr; for (pixel_y = 0; pixel_y < 4; pixel_y++) { uint8_t index = bytestream2_get_byteu(&s->gb); @@ -189,7 +194,6 @@ static void rpza_decode_stream(RpzaContext *s) } block_ptr += row_inc; } - ADVANCE_BLOCK(); } break; @@ -197,6 +201,7 @@ static void rpza_decode_stream(RpzaContext *s) case 0x00: if (bytestream2_get_bytes_left(&s->gb) < 30) return; + ADVANCE_BLOCK(); block_ptr = row_ptr + pixel_ptr; for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++){ @@ -208,7 +213,6 @@ static void rpza_decode_stream(RpzaContext *s) } block_ptr += row_inc; } - ADVANCE_BLOCK(); break; /* Unknown opcode */ @@ -244,10 +248,8 @@ static int rpza_decode_frame(AVCodecContext *avctx, bytestream2_init(&s->gb, avpkt->data, avpkt->size); - if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret; - } rpza_decode_stream(s); |