On Sat, Jan 07, 2012 at 01:39:15PM -0600, Daniel Huang wrote:
>
> From 36b6be5587e25ee6b101b7bb7bd627982ed835d8 Mon Sep 17 00:00:00 2001
> From: Daniel Huang <[email protected]>
> Date: Sat, 7 Jan 2012 12:23:14 -0600
> Subject: [PATCH] mjpegdec K&R cosmetics cleanup
>
> ---
> libavcodec/mjpegdec.c | 1209
> ++++++++++++++++++++++++-------------------------
> 1 files changed, 602 insertions(+), 607 deletions(-)
Once more with feeling: change the log message to:
mjpegdec: K&R formatting cosmetics
> --- a/libavcodec/mjpegdec.c
> +++ b/libavcodec/mjpegdec.c
> @@ -140,19 +141,18 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s)
>
> - //XXX FIXME finetune, and perhaps add dc too
> - s->qscale[index]= FFMAX(
> - s->quant_matrixes[index][s->scantable.permutated[1]],
> + // XXX FIXME finetune, and perhaps add dc too
> + s->qscale[index] =
> + FFMAX(s->quant_matrixes[index][s->scantable.permutated[1]],
> s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1;
Indentation of the FFMAX invocation is off.
> @@ -338,46 +342,44 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
> @@ -427,14 +428,14 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM
> *block,
> {
> - int cache=GET_CACHE(re,&s->gb);
> - int sign=(~cache)>>31;
> - level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign;
> + int cache = GET_CACHE(re, &s->gb);
> + int sign = (~cache) >> 31;
> + level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign;
> }
The indentation was correct before.
> @@ -469,38 +470,38 @@ static int decode_dc_progressive(MJpegDecodeContext *s,
> DCTELEM *block, int comp
> {
> - int cache=GET_CACHE(re,&s->gb);
> - int sign=(~cache)>>31;
> - level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign;
> + int cache = GET_CACHE(re, &s->gb);
> + int sign = (~cache) >> 31;
> + level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign;
> }
same
> @@ -530,52 +531,52 @@ static int decode_block_progressive(MJpegDecodeContext
> *s, DCTELEM *block, uint8
>
> -#define REFINE_BIT(j) {\
> - UPDATE_CACHE(re, &s->gb);\
> - sign = block[j]>>15;\
> +#define REFINE_BIT(j) {
> \
> + UPDATE_CACHE(re, &s->gb);
> \
> + sign = block[j] >> 15;
> \
> block[j] += SHOW_UBITS(re, &s->gb, 1) * ((quant_matrix[j]^sign)-sign) <<
> Al;\
> - LAST_SKIP_BITS(re, &s->gb, 1);\
> + LAST_SKIP_BITS(re, &s->gb, 1);
> \
> }
Break the long line in there.
> -#define ZERO_RUN \
> -for(;;i++) {\
> - if(i > last) {\
> - i += run;\
> - if(i > se) {\
> +#define ZERO_RUN \
> +for (; ; i++) { \
> + if (i > last) { \
> + i += run; \
> + if (i > se) { \
> av_log(s->avctx, AV_LOG_ERROR, "error count: %d\n", i);\
> - return -1;\
> - }\
> - break;\
> - }\
> - j = s->scantable.permutated[i];\
> - if(block[j])\
> - REFINE_BIT(j)\
> - else if(run-- == 0)\
> - break;\
> + return -1; \
> + } \
> + break; \
> + } \
> + j = s->scantable.permutated[i]; \
> + if (block[j]) \
> + REFINE_BIT(j) \
> + else if (run-- == 0) \
> + break; \
> }
Move the \ one more space to the right.
> @@ -624,43 +625,46 @@ static int decode_block_refinement(MJpegDecodeContext
> *s, DCTELEM *block, uint8_
> int i, mb_x, mb_y;
> uint16_t (*buffer)[4];
> int left[3], top[3], topleft[3];
> - const int linesize= s->linesize[0];
> - const int mask= (1<<s->bits)-1;
> + const int linesize = s->linesize[0];
> + const int mask = (1 << s->bits)-1;
space around -
> - av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size,
> (unsigned)s->mb_width * 4 * sizeof(s->ljpeg_buffer[0][0]));
> + av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size,
> + (unsigned)s->mb_width * 4 * sizeof(s->ljpeg_buffer[0][0]));
Indentation is off.
> @@ -791,48 +798,51 @@ static av_always_inline void mjpeg_copy_block(uint8_t
> *dst, const uint8_t *src,
>
> - if(s->flipped && s->avctx->flags & CODEC_FLAG_EMU_EDGE) {
> + if (s->flipped && s->avctx->flags & CODEC_FLAG_EMU_EDGE) {
> av_log(s->avctx, AV_LOG_ERROR, "Can not flip image with
> CODEC_FLAG_EMU_EDGE set!\n");
Break this line.
> - for(i=0;i<nb_components;i++) {
> + for (i = 0;i < nb_components; i++) {
space after ;
> @@ -842,38 +852,40 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int
> nb_components, int Ah, i
> block[0] += get_bits1(&s->gb) *
> s->quant_matrixes[ s->quant_index[c] ][0] << Al;
> - else if(decode_dc_progressive(s, block, i,
> s->dc_index[i], s->quant_matrixes[ s->quant_index[c] ], Al) < 0) {
> + else if (decode_dc_progressive(s, block, i,
> s->dc_index[i],
> + s->quant_matrixes[ s->quant_index[c] ], Al)
> < 0) {
Indentation is off.
> -// av_log(s->avctx, AV_LOG_DEBUG, "mb: %d %d
> processed\n", mb_y, mb_x);
> -//av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d %d %d %d %d \n", mb_x, mb_y, x, y,
> c, s->bottom_field, (v * mb_y + y) * 8, (h * mb_x + x) * 8);
> +// av_log(s->avctx, AV_LOG_DEBUG, "mb: %d %d processed\n", mb_y,
> mb_x);
> +// av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d %d %d %d %d \n", mb_x,
> mb_y, x, y, c, s->bottom_field, (v * mb_y + y) * 8, (h * mb_x + x) * 8);
Break the lines while you're at it.
> @@ -904,61 +915,61 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int
> nb_components, int Ah, i
>
> - if(!Al) {
> - s->coefs_finished[c] |= (1LL<<(se+1))-(1LL<<ss);
> + if (!Al) {
> + s->coefs_finished[c] |= (1LL << (se + 1))-(1LL << ss);
space around -
> @@ -971,31 +982,31 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
>
> - for(i=0;i<nb_components;i++) {
> + for (i = 0;i < nb_components; i++) {
space after ;
> @@ -1051,30 +1064,30 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
>
> - if(s->lossless){
> - if(CONFIG_JPEGLS_DECODER && s->ls){
> -// for(){
> + if (s->lossless) {
> + if (CONFIG_JPEGLS_DECODER && s->ls) {
> +// for (){
> // reset_ls_coding_parameters(s, 0);
space before {
> @@ -1090,35 +1103,34 @@ static int mjpeg_decode_dri(MJpegDecodeContext *s)
>
> -static int mjpeg_decode_app(MJpegDecodeContext *s)
> +static int mjpeg_decode_app (MJpegDecodeContext *s)
This was correct before.
> @@ -1187,21 +1197,21 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
> - switch( get_bits(&s->gb, 8)){
> + switch( get_bits(&s->gb, 8)) {
Drop the spaces inside ().
> case 1:
> - s->rgb= 1;
> - s->pegasus_rct=0;
> + s->rgb = 1;
> + s->pegasus_rct = 0;
> break;
> case 2:
> - s->rgb= 1;
> - s->pegasus_rct=1;
> + s->rgb = 1;
> + s->pegasus_rct = 1;
> break;
align =
> @@ -1255,25 +1263,21 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
>
> /* buggy avid, it puts EOI only at every 10th frame */
> if (!strcmp(cbuf, "AVID"))
> - {
> s->buggy_avid = 1;
> - // if (s->first_picture)
> - // printf("mjpeg: workarounding buggy AVID\n");
> - }
> - else if(!strcmp(cbuf, "CS=ITU601")){
> - s->cs_itu601= 1;
> - }
> - else if((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library",
> 21)) ||
> - (len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec",
> 20))){
> - s->flipped = 1;
> - }
> + // if (s->first_picture)
> + // printf("mjpeg: workarounding buggy AVID\n");
> + else if (!strcmp(cbuf, "CS=ITU601"))
> + s->cs_itu601 = 1;
> + else if ((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library",
> 21)) ||
> + (len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec",
> 20)))
> + s->flipped = 1;
Keep the {} in the first if-block, you are making it hard to reenable the
commented-out code. Also fix the excessive spacing in the comment block.
> @@ -1319,97 +1323,89 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
>
> - if ((buf_end - *buf_ptr) > s->buffer_size)
> - {
> - av_free(s->buffer);
> - s->buffer_size = buf_end - *buf_ptr;
> - s->buffer = av_malloc(s->buffer_size +
> FF_INPUT_BUFFER_PADDING_SIZE);
> - av_log(s->avctx, AV_LOG_DEBUG, "buffer too small,
> expanding to %d bytes\n",
> - s->buffer_size);
> - }
> + if ((buf_end - *buf_ptr) > s->buffer_size) {
> + av_free(s->buffer);
> + s->buffer_size = buf_end - *buf_ptr;
> + s->buffer = av_malloc(s->buffer_size + FF_INPUT_BUFFER_PADDING_SIZE);
> + av_log(s->avctx, AV_LOG_DEBUG, "buffer too small, expanding to %d
> bytes\n",
> + s->buffer_size);
> + }
Align some =, indentation of } is off.
> @@ -1427,148 +1423,145 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
> + case SOF0:
> + case SOF1:
> + s->lossless = 0;
> + s->ls = 0;
> + s->progressive = 0;
> + if (ff_mjpeg_decode_sof(s) < 0)
> + return -1;
> + break;
Align some =, more below.
> - if(!s->lossless){
> - picture->quality= FFMAX3(s->qscale[0], s->qscale[1],
> s->qscale[2]);
> - picture->qstride= 0;
> - picture->qscale_table= s->qscale_table;
> + if (!s->lossless) {
> + picture->quality = FFMAX3(s->qscale[0],
> s->qscale[1], s->qscale[2]);
> + picture->qstride = 0;
> + picture->qscale_table = s->qscale_table;
align
> @@ -1610,40 +1604,41 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
>
> static const AVClass mjpegdec_class = {
> - .class_name = "MJPEG decoder",
> - .item_name = av_default_item_name,
> - .option = options,
> - .version = LIBAVUTIL_VERSION_INT,
> + .class_name = "MJPEG decoder",
> + .item_name = av_default_item_name,
> + .option = options,
> + .version = LIBAVUTIL_VERSION_INT,
> };
You add too many spaces before the '=', same below.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
