----- Original Message -----
> From: Aneesh Dogra <[email protected]>
> To: [email protected]
> Cc: Aneesh Dogra <[email protected]>
> Sent: Saturday, December 31, 2011 6:29 PM
> Subject: [libav-devel] [PATCH 3/8] bethsoftvideo: K&R cleanup
>
> ---
> libavcodec/bethsoftvideo.c | 36 ++++++++++++++++++++----------------
> 1 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
> index f4020d6..c751c68 100644
> --- a/libavcodec/bethsoftvideo.c
> +++ b/libavcodec/bethsoftvideo.c
> @@ -46,24 +46,25 @@ static av_cold int bethsoftvid_decode_init(AVCodecContext
> *avctx)
> return 0;
> }
>
> -static int set_palette(AVFrame * frame, const uint8_t * palette_buffer, int
> buf_size)
> +static int set_palette(AVFrame * frame, const uint8_t * palette_buffer,
> + int buf_size)
These should have been like "type *var_name" instead of "type * var_name".
> {
> - uint32_t * palette = (uint32_t *)frame->data[1];
> + uint32_t *palette = (uint32_t *)frame->data[1];
Put a space after ')'.
> int a;
>
> - if (buf_size < 256*3)
> + if (buf_size < 256 * 3)
> return AVERROR_INVALIDDATA;
>
> for(a = 0; a < 256; a++){
> palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4;
> }
> frame->palette_has_changed = 1;
> - return 256*3;
> + return 256 * 3;
> }
>
> static int bethsoftvid_decode_frame(AVCodecContext *avctx,
> - void *data, int *data_size,
> - AVPacket *avpkt)
> + void *data, int *data_size,
> + AVPacket *avpkt)
> {
> const uint8_t *buf = avpkt->data;
> int buf_size = avpkt->size;
> @@ -71,7 +72,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
> char block_type;
> uint8_t * dst;
> uint8_t * frame_end;
You are supposed to change these too. ("uint8_t *frame_end"
instead of "uint8_t * frame_end".) Look for more such issues
in the file and fix all of them.
> - int remaining = avctx->width; // number of bytes remaining on a
> line
> + int remaining = avctx->width; // number of bytes remaining on a
> line
> const int wrap_to_next_line = vid->frame.linesize[0] - avctx->width;
> int code;
> int yoffset;
> @@ -83,7 +84,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
> dst = vid->frame.data[0];
> frame_end = vid->frame.data[0] + vid->frame.linesize[0] *
> avctx->height;
>
> - switch(block_type = *buf++){
> + switch (block_type = *buf++) {
> case PALETTE_BLOCK:
> return set_palette(&vid->frame, buf, buf_size);
> case VIDEO_YOFF_P_FRAME:
> @@ -94,24 +95,27 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
> }
>
> // main code
> - while((code = *buf++)){
> + while ((code = *buf++)) {
> int length = code & 0x7f;
>
> - // copy any bytes starting at the current position, and ending at
> the
> frame width
> - while(length > remaining){
> - if(code < 0x80)
> + // copy any bytes starting at the current position, and ending at
> + // the frame width
> + while (length > remaining) {
> + if (code < 0x80)
> bytestream_get_buffer(&buf, dst, remaining);
> else if(block_type == VIDEO_I_FRAME)
There should be a space after 'if'.
> memset(dst, buf[0], remaining);
> - length -= remaining; // decrement the number of bytes to be
> copied
> - dst += remaining + wrap_to_next_line; // skip over extra
> bytes
> at end of frame
> + // decrement the number of bytes to be copied
> + length -= remaining;
> + // skip over extra bytes at end of frame
> + dst += remaining + wrap_to_next_line;
> remaining = avctx->width;
> if(dst == frame_end)
> goto end;
> }
>
> // copy any remaining bytes after / if line overflows
> - if(code < 0x80)
> + if (code < 0x80)
> bytestream_get_buffer(&buf, dst, length);
> else if(block_type == VIDEO_I_FRAME)
> memset(dst, *buf++, length);
> @@ -121,7 +125,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
> end:
>
> *data_size = sizeof(AVFrame);
> - *(AVFrame*)data = vid->frame;
> + *(AVFrame *)data = vid->frame;
>
Not sure if it needs a space after ')'. Ask someone
in the channel before submitting another patch.
> return buf_size;
> }
> --
> 1.7.7.3
>
I am not sure if you have been careful enough. My guess
is that there are still remaining cosmetic issues left
in that file. Send a complete patch.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
