From 9deccfbac8a2abf1a7e0dc9e6413097bc49a4247 Mon Sep 17 00:00:00 2001
From: Daniel <[email protected]>
Date: Thu, 5 Jan 2012 21:49:59 -0600
Subject: [PATCH] mjpegdec.c: K&R cosmetics cleanup
---
libavcodec/mjpegdec.c | 261 +++++++++++++++++++++++++------------------------
1 files changed, 131 insertions(+), 130 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ece7da2..639fe69 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -42,13 +42,13 @@
#include "jpeglsdec.h"
-static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table,
+static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table,
int nb_codes, int use_static, int is_ac)
{
- uint8_t huff_size[256];
- uint16_t huff_code[256];
- uint16_t huff_sym[256];
- int i;
+ uint8_t huff_size[256];
+ uint16_t huff_code[256];
+ uint16_t huff_sym[256];
+ int i;
assert(nb_codes <= 256);
@@ -58,25 +58,32 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_tab
for (i = 0; i < 256; i++)
huff_sym[i] = i + 16 * is_ac;
- if (is_ac) huff_sym[0] = 16 * 256;
+ if (is_ac)
+ huff_sym[0] = 16 * 256;
- return init_vlc_sparse(vlc, 9, nb_codes, huff_size, 1, 1,
+ return init_vlc_sparse(vlc, 9, nb_codes, huff_size, 1, 1,
huff_code, 2, 2, huff_sym, 2, 2, use_static);
}
-static void build_basic_mjpeg_vlc(MJpegDecodeContext *s)
+static void build_basic_mjpeg_vlc(MJpegDecodeContext *s)
{
- build_vlc(&s->vlcs[0][0], ff_mjpeg_bits_dc_luminance, ff_mjpeg_val_dc, 12, 0, 0);
-
- build_vlc(&s->vlcs[0][1], ff_mjpeg_bits_dc_chrominance, ff_mjpeg_val_dc, 12, 0, 0);
-
- build_vlc(&s->vlcs[1][0], ff_mjpeg_bits_ac_luminance, ff_mjpeg_val_ac_luminance, 251, 0, 1);
-
- build_vlc(&s->vlcs[1][1], ff_mjpeg_bits_ac_chrominance, ff_mjpeg_val_ac_chrominance, 251, 0, 1);
-
- build_vlc(&s->vlcs[2][0], ff_mjpeg_bits_ac_luminance, ff_mjpeg_val_ac_luminance, 251, 0, 0);
-
- build_vlc(&s->vlcs[2][1], ff_mjpeg_bits_ac_chrominance,ff_mjpeg_val_ac_chrominance, 251, 0, 0);
+ build_vlc(&s->vlcs[0][0], ff_mjpeg_bits_dc_luminance,
+ ff_mjpeg_val_dc, 12, 0, 0);
+
+ build_vlc(&s->vlcs[0][1], ff_mjpeg_bits_dc_chrominance,
+ ff_mjpeg_val_dc, 12, 0, 0);
+
+ build_vlc(&s->vlcs[1][0], ff_mjpeg_bits_ac_luminance,
+ ff_mjpeg_val_ac_luminance, 251, 0, 1);
+
+ build_vlc(&s->vlcs[1][1], ff_mjpeg_bits_ac_chrominance,
+ ff_mjpeg_val_ac_chrominance, 251, 0, 1);
+
+ build_vlc(&s->vlcs[2][0], ff_mjpeg_bits_ac_luminance,
+ ff_mjpeg_val_ac_luminance, 251, 0, 0);
+
+ build_vlc(&s->vlcs[2][1], ff_mjpeg_bits_ac_chrominance,
+ ff_mjpeg_val_ac_chrominance, 251, 0, 0);
}
av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
@@ -192,12 +199,12 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s)
/* build VLC and flush previous vlc if present */
free_vlc(&s->vlcs[class][index]);
- av_log(s->avctx, AV_LOG_DEBUG, "class=%d index=%d nb_codes=%d\n",
+ av_log(s->avctx, AV_LOG_DEBUG, "class=%d index=%d nb_codes=%d\n",
class, index, code_max + 1);
if (build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1, 0, class > 0) < 0)
return -1;
- if (class>0) {
+ if (class > 0) {
free_vlc(&s->vlcs[2][index]);
if (build_vlc(&s->vlcs[2][index], bits_table, val_table, code_max + 1, 0, 0) < 0)
return -1;
@@ -214,8 +221,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
len = get_bits(&s->gb, 16);
s->bits = get_bits(&s->gb, 8);
- if (s->pegasus_rct) s->bits = 9;
- if (s->bits == 9 && !s->pegasus_rct) s->rct = 1; //FIXME ugly
+ if (s->pegasus_rct)
+ s->bits = 9;
+ if (s->bits == 9 && !s->pegasus_rct)
+ s->rct = 1;
if (s->bits != 8 && !s->lossless) {
av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n");
@@ -226,7 +235,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
width = get_bits(&s->gb, 16);
//HACK for odd_height.mov
- if(s->interlaced && s->width == width && s->height == height + 1)
+ if (s->interlaced && s->width == width && s->height == height + 1)
height= s->height;
av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height);
@@ -234,8 +243,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
return -1;
nb_components = get_bits(&s->gb, 8);
- if (nb_components <= 0 ||
- nb_components > MAX_COMPONENTS)
+ if (nb_components <= 0 || nb_components > MAX_COMPONENTS)
return -1;
if (s->ls && !(s->bits <= 8 || nb_components == 1)) {
av_log(s->avctx, AV_LOG_ERROR, "only <= 8 bits/component or 16-bit gray accepted for JPEG-LS\n");
@@ -266,9 +274,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
return -1;
}
- if(s->v_max == 1 &&
- s->h_max == 1 &&
- s->lossless == 1) s->rgb=1;
+ if (s->v_max == 1 && s->h_max == 1 && s->lossless == 1)
+ s->rgb = 1;
/* if different size, realloc/alloc picture */
/* XXX: also check h_count and v_count */
@@ -292,7 +299,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
avcodec_set_dimensions(s->avctx, width, height);
- s->qscale_table= av_mallocz((s->width+15)/16);
+ s->qscale_table = av_mallocz((s->width + 15)/16);
s->first_picture = 0;
}
@@ -307,18 +314,18 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
(s->h_count[3] << 4) | s->v_count[3];
av_log(s->avctx, AV_LOG_DEBUG, "pix fmt id %x\n", pix_fmt_id);
//NOTE we do not allocate pictures large enough for the possible padding of h/v_count being 4
- if(!(pix_fmt_id & 0xD0D0D0D0))
- pix_fmt_id-= (pix_fmt_id & 0xF0F0F0F0)>>1;
- if(!(pix_fmt_id & 0x0D0D0D0D))
- pix_fmt_id-= (pix_fmt_id & 0x0F0F0F0F)>>1;
+ if (!(pix_fmt_id & 0xD0D0D0D0))
+ pix_fmt_id -= (pix_fmt_id & 0xF0F0F0F0) >> 1;
+ if (!(pix_fmt_id & 0x0D0D0D0D))
+ pix_fmt_id -= (pix_fmt_id & 0x0F0F0F0F) >> 1;
switch (pix_fmt_id) {
case 0x11111100:
- if (s->rgb) {
+ if (s->rgb)
s->avctx->pix_fmt = PIX_FMT_BGRA;
- } else
+ else
s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P;
- assert(s->nb_components==3);
+ assert(s->nb_components == 3);
break;
case 0x11000000:
s->avctx->pix_fmt = PIX_FMT_GRAY8;
@@ -337,9 +344,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
return -1;
}
if (s->ls) {
- if(s->nb_components > 1)
+ if (s->nb_components > 1)
s->avctx->pix_fmt = PIX_FMT_RGB24;
- else if(s->bits <= 8)
+ else if (s->bits <= 8)
s->avctx->pix_fmt = PIX_FMT_GRAY8;
else
s->avctx->pix_fmt = PIX_FMT_GRAY16;
@@ -352,13 +359,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- s->picture_ptr->pict_type= AV_PICTURE_TYPE_I;
- s->picture_ptr->key_frame= 1;
+ s->picture_ptr->pict_type = AV_PICTURE_TYPE_I;
+ s->picture_ptr->key_frame = 1;
s->got_picture = 1;
- for (i=0; i<3; i++) {
- s->linesize[i]= s->picture_ptr->linesize[i] << s->interlaced;
- }
+ for (i = 0; i < 3; i++)
+ s->linesize[i] = s->picture_ptr->linesize[i] << s->interlaced;
// printf("%d %d %d %d %d %d\n", s->width, s->height, s->linesize[0], s->linesize[1], s->interlaced, s->avctx->height);
@@ -386,8 +392,7 @@ static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index)
{
int code;
code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2);
- if (code < 0)
- {
+ if (code < 0) {
av_log(s->avctx, AV_LOG_WARNING, "mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index,
&s->vlcs[0][dc_index]);
return 0xffff;
@@ -427,12 +432,11 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
if (code > MIN_CACHE_BITS - 16) {
UPDATE_CACHE(re, &s->gb);
}
- {
- 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;
}
-
LAST_SKIP_BITS(re, &s->gb, code);
@@ -443,7 +447,7 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
j = s->scantable.permutated[i];
block[j] = level * quant_matrix[j];
}
- } while(i<63);
+ } while (i < 63);
CLOSE_READER(re, &s->gb);}
return 0;
@@ -488,13 +492,12 @@ static int decode_block_progressive(MJpegDecodeContext *s, DCTELEM *block, uint8
i += run;
if (code > MIN_CACHE_BITS - 16) {
UPDATE_CACHE(re, &s->gb);
- }
+ }
{
- 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;
}
-
LAST_SKIP_BITS(re, &s->gb, code);
if (i >= se) {
@@ -529,32 +532,32 @@ static int decode_block_progressive(MJpegDecodeContext *s, DCTELEM *block, uint8
}
CLOSE_READER(re, &s->gb);}
- if(i > *last_nnz)
+ if (i > *last_nnz)
*last_nnz = i;
return 0;
}
#define REFINE_BIT(j) {\
UPDATE_CACHE(re, &s->gb);\
- sign = block[j]>>15;\
+ 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);\
}
#define ZERO_RUN \
-for(;;i++) {\
- if(i > last) {\
+for (; ; i++) {\
+ if (i > last) {\
i += run;\
- if(i > se) {\
+ 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])\
+ if (block[j])\
REFINE_BIT(j)\
- else if(run-- == 0)\
+ else if (run-- == 0)\
break;\
}
@@ -584,14 +587,14 @@ static int decode_block_refinement(MJpegDecodeContext *s, DCTELEM *block, uint8_
val--;
block[j] = ((quant_matrix[j]^val)-val) << Al;
if (i == se) {
- if(i > *last_nnz)
+ if (i > *last_nnz)
*last_nnz = i;
CLOSE_READER(re, &s->gb);
return 0;
}
} else {
run = ((unsigned) code) >> 4;
- if(run == 0xF){
+ if (run == 0xF) {
ZERO_RUN;
} else {
val = run;
@@ -629,24 +632,24 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point
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 mask = (1 << s->bits)-1;
av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size, (unsigned)s->mb_width * 4 * sizeof(s->ljpeg_buffer[0][0]));
- buffer= s->ljpeg_buffer;
+ buffer = s->ljpeg_buffer;
+
+ for (i = 0; i < 3; i++)
+ buffer[0][i] = 1 << (s->bits + point_transform - 1);
- for (i = 0; i < 3; i++) {
- buffer[0][i]= 1 << (s->bits + point_transform - 1);
- }
for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
- const int modified_predictor= mb_y ? predictor : 1;
+ const int modified_predictor = mb_y ? predictor : 1;
uint8_t *ptr = s->picture_ptr->data[0] + (linesize * mb_y);
if (s->interlaced && s->bottom_field)
ptr += linesize >> 1;
- for (i = 0; i < 3; i++){
+ for (i = 0; i < 3; i++)
top[i] = left[i] = topleft[i] = buffer[0][i];
- }
+
for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
if (s->restart_interval && !s->restart_count)
s->restart_count = s->restart_interval;
@@ -659,7 +662,7 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point
PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
- left[i] = buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform));
+ left[i] = buffer[mb_x][i] = mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform));
}
if (s->restart_interval && !--s->restart_count) {
@@ -709,7 +712,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point
c = s->comp_index[i];
h = s->h_scount[i];
v = s->v_scount[i];
- x = 0;
+ x = 0;
y = 0;
linesize = s->linesize[c];
@@ -718,18 +721,18 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point
ptr = s->picture_ptr->data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
if (y == 0 && mb_y == 0) {
- if (x == 0 && mb_x == 0) {
+ if (x == 0 && mb_x == 0)
pred = 128 << point_transform;
- } else {
+ else
pred = ptr[-1];
- }
+
} else {
- if (x == 0 && mb_x == 0) {
+ if (x == 0 && mb_x == 0)
pred = ptr[-linesize];
- } else {
+ else
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
- }
- }
+
+ }
if (s->interlaced && s->bottom_field)
ptr += linesize >> 1;
@@ -802,16 +805,16 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
if (mb_bitmask)
init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width*s->mb_height);
- 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");
s->flipped = 0;
}
-
- for (i=0; i < nb_components; i++) {
+
+ for (i = 0; i < nb_components; i++) {
int c = s->comp_index[i];
data[c] = s->picture_ptr->data[c];
reference_data[c] = reference ? reference->data[c] : NULL;
- linesize[c] =s->linesize[c];
+ linesize[c] = s->linesize[c];
s->coefs_finished[c] |= 1;
if (s->flipped) {
//picture should be flipped upside-down for this codec
@@ -830,7 +833,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
s->restart_count = s->restart_interval;
if (get_bits_count(&s->gb)>s->gb.size_in_bits) {
- av_log(s->avctx, AV_LOG_ERROR, "overread %d\n",
+ av_log(s->avctx, AV_LOG_ERROR, "overread %d\n",
get_bits_count(&s->gb) - s->gb.size_in_bits);
return -1;
}
@@ -844,7 +847,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
v = s->v_scount[i];
x = 0;
y = 0;
- for (j=0;j<n;j++) {
+ for (j = 0;j < n; j++) {
block_offset = (((linesize[c] * (v * mb_y + y) * 8) +
(h * mb_x + x) * 8) >> s->avctx->lowres);
@@ -852,9 +855,9 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
block_offset += linesize[c] >> 1;
ptr = data[c] + block_offset;
if (!s->progressive) {
- if (copy_mb) {
+ if (copy_mb)
mjpeg_copy_block(ptr, reference_data[c] + block_offset, linesize[c], s->avctx->lowres);
- } else {
+ else {
s->dsp.clear_block(s->block);
if (decode_block(s, s->block, i,
s->dc_index[i], s->ac_index[i],
@@ -867,9 +870,9 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
} else {
int block_idx = s->block_stride[c] * (v * mb_y + y) + (h * mb_x + x);
DCTELEM *block = s->blocks[c][block_idx];
- if(Ah)
+ if (Ah)
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) {
av_log(s->avctx, AV_LOG_ERROR, "error y=%d x=%d\n", mb_y, mb_x);
return -1;
}
@@ -889,7 +892,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
while (show_bits(&s->gb, 8) == 0xFF)
skip_bits(&s->gb, 8);
skip_bits(&s->gb, 8);
- for (i=0; i<nb_components; i++) /* reset dc */
+ for (i = 0; i < nb_components; i++) /* reset dc */
s->last_dc[i] = 1024;
}
}
@@ -910,12 +913,11 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, int s
int16_t *quant_matrix = s->quant_matrixes[ s->quant_index[c] ];
GetBitContext mb_bitmask_gb;
- if (mb_bitmask) {
+ if (mb_bitmask)
init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width*s->mb_height);
- }
if (!Al) {
- s->coefs_finished[c] |= (1LL<<(se+1))-(1LL<<ss);
+ s->coefs_finished[c] |= (1LL << (se+1))-(1LL << ss);
last_scan = !~s->coefs_finished[c];
}
@@ -949,9 +951,9 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, int s
}
if (last_scan) {
- if (copy_mb) {
+ if (copy_mb)
mjpeg_copy_block(ptr, reference_data + block_offset, linesize, s->avctx->lowres);
- } else {
+ else {
s->dsp.idct_put(ptr, linesize, *block);
ptr += 8 >> s->avctx->lowres;
}
@@ -966,7 +968,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
{
int len, nb_components, i, h, v, predictor, point_transform;
int index, id;
- const int block_size= s->lossless ? 1 : 8;
+ const int block_size = s->lossless ? 1 : 8;
int ilv, prev_shift;
/* XXX: verify len field validity */
@@ -1007,9 +1009,9 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
s->dc_index[i] = get_bits(&s->gb, 4);
s->ac_index[i] = get_bits(&s->gb, 4);
- if (s->dc_index[i] < 0 ||
+ if (s->dc_index[i] < 0 ||
s->ac_index[i] < 0 ||
- s->dc_index[i] >= 4 ||
+ s->dc_index[i] >= 4 ||
s->ac_index[i] >= 4)
goto out_of_range;
if (!s->vlcs[0][s->dc_index[i]].table ||
@@ -1020,7 +1022,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
predictor = get_bits(&s->gb, 8); /* JPEG Ss / lossless JPEG predictor /JPEG-LS NEAR */
ilv = get_bits(&s->gb, 8); /* JPEG Se / JPEG-LS ILV */
prev_shift = get_bits(&s->gb, 4); /* Ah */
- point_transform= get_bits(&s->gb, 4); /* Al */
+ point_transform = get_bits(&s->gb, 4); /* Al */
for (i = 0; i < nb_components; i++)
s->last_dc[i] = 1024;
@@ -1040,7 +1042,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
}
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n",
+ av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n",
s->lossless ? "lossless" : "sequential DCT", s->rgb ? "RGB" : "",
predictor, point_transform, ilv, s->bits,
s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : ""));
@@ -1052,7 +1054,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s,
if (s->lossless) {
if (CONFIG_JPEGLS_DECODER && s->ls) {
-// for(){
+// for (){
// reset_ls_coding_parameters(s, 0);
if (ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0)
@@ -1103,16 +1105,15 @@ static int mjpeg_decode_app (MJpegDecodeContext *s)
len = get_bits(&s->gb, 16);
if (len < 5)
return -1;
- if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits)
+ if (8 * len + get_bits_count(&s->gb) > s->gb.size_in_bits)
return -1;
id = get_bits_long(&s->gb, 32);
id = av_be2ne32(id);
len -= 6;
- if(s->avctx->debug & FF_DEBUG_STARTCODE){
+ if (s->avctx->debug & FF_DEBUG_STARTCODE)
av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);
- }
/* Buggy AVID, it puts EOI only at every 10th frame. */
/* Also, this fourcc is used by non-avid files too, it holds some
@@ -1129,8 +1130,10 @@ static int mjpeg_decode_app (MJpegDecodeContext *s)
// if (s->first_picture)
// printf("mjpeg: workarounding buggy AVID\n");
i = get_bits(&s->gb, 8);
- if (i==2) s->bottom_field = 1;
- else if(i==1) s->bottom_field = 0;
+ if (i == 2)
+ s->bottom_field = 1;
+ else if (i == 1)
+ s->bottom_field = 0;
#if 0
skip_bits(&s->gb, 8);
skip_bits(&s->gb, 32);
@@ -1254,16 +1257,15 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
/* buggy avid, it puts EOI only at every 10th frame */
- if (!strcmp(cbuf, "AVID")) {
+ if (!strcmp(cbuf, "AVID"))
s->buggy_avid = 1;
// if (s->first_picture)
// printf("mjpeg: workarounding buggy AVID\n");
- } else if (!strcmp(cbuf, "CS=ITU601")) {
+ 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;
- }
+ else if ((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)) ||
+ (len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec", 20)))
+ s->flipped = 1;
av_free(cbuf);
}
@@ -1280,7 +1282,7 @@ static int find_marker(const uint8_t **pbuf_ptr, const uint8_t *buf_end)
unsigned int v, v2;
int val;
#ifdef DEBUG
- int skipped=0;
+ int skipped = 0;
#endif
buf_ptr = *pbuf_ptr;
@@ -1312,7 +1314,7 @@ 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);
+ 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);
}
@@ -1356,7 +1358,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
while (src + t < buf_end) {
uint8_t x = src[t++];
if (x == 0xff) {
- while((src + t < buf_end) && x == 0xff)
+ while ((src + t < buf_end) && x == 0xff)
x = src[t++];
if (x & 0x80) {
t -= 2;
@@ -1368,7 +1370,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
init_put_bits(&pb, dst, t);
/* unescape bitstream */
- while(b < t) {
+ while (b < t) {
uint8_t x = src[b++];
put_bits(&pb, 8, x);
if (x == 0xFF) {
@@ -1410,28 +1412,27 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
start_code = ff_mjpeg_find_marker(s, &buf_ptr, buf_end,
&unescaped_buf_ptr, &unescaped_buf_size);
/* EOF */
- if (start_code < 0) {
+ if (start_code < 0)
goto the_end;
- } else {
+ else {
av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%td\n",
start_code, buf_end - buf_ptr);
init_get_bits(&s->gb, unescaped_buf_ptr, unescaped_buf_size*8);
s->start_code = start_code;
- if(s->avctx->debug & FF_DEBUG_STARTCODE)
+ if (s->avctx->debug & FF_DEBUG_STARTCODE)
av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
/* process markers */
- if (start_code >= 0xd0 && start_code <= 0xd7) {
+ if (start_code >= 0xd0 && start_code <= 0xd7)
av_log(avctx, AV_LOG_DEBUG, "restart marker: %d\n", start_code&0x0f);
/* APP fields */
- } else if (start_code >= APP0 && start_code <= APP15) {
+ else if (start_code >= APP0 && start_code <= APP15)
mjpeg_decode_app(s);
/* Comment */
- } else if (start_code == COM) {
+ else if (start_code == COM)
mjpeg_decode_com(s);
- }
switch (start_code) {
case SOI:
@@ -1473,7 +1474,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
case SOF48:
s->lossless = 1;
s->ls = 1;
- s->progressive=0;
+ s->progressive = 0;
if (ff_mjpeg_decode_sof(s) < 0)
return -1;
break;
@@ -1506,7 +1507,7 @@ eoi_parser:
memset(picture->qscale_table, picture->quality, (s->width+15)/16);
if (avctx->debug & FF_DEBUG_QP)
av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
- picture->quality*= FF_QP2LAMBDA;
+ picture->quality *= FF_QP2LAMBDA;
}
goto the_end;
@@ -1580,7 +1581,7 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
for (j = 0; j < 4; j++)
free_vlc(&s->vlcs[i][j]);
}
- for(i = 0; i < MAX_COMPONENTS; i++) {
+ for (i = 0; i < MAX_COMPONENTS; i++) {
av_freep(&s->blocks[i]);
av_freep(&s->last_nnz[i]);
}
--
1.7.5.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
