highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'

Browse Source 
* commit 'f32aefcf349f2f1367f0143782397643416d18f3':
  faxcompr: K&R formatting cosmetics

Conflicts:
	libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-08 12:30:15 +02:00
commit a5a9bcc876
1 changed files with 79 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/faxcompr.c
View File

@ -124,7 +124,8 @@ av_cold void ff_ccitt_unpack_init(void)
static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
unsigned int pix_left, int *runs, const int *runend) unsigned int pix_left, int *runs,
const int *runend)
{ {
int mode = 0; int mode = 0;
unsigned int run = 0; unsigned int run = 0;
@ -157,7 +158,8 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
} }
static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
unsigned int width, int *runs, const int *runend, const int *ref) unsigned int width, int *runs,
const int *runend, const int *ref)
{ {
int mode = 0, saved_run = 0, t; int mode = 0, saved_run = 0, t;
int run_off = *ref++; int run_off = *ref++;
@ -209,7 +211,8 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
mode = !mode; mode = !mode;
} }
} else if (cmode == 9 || cmode == 10) { } else if (cmode == 9 || cmode == 10) {
av_log(avctx, AV_LOG_ERROR, "Special modes are not supported (yet)\n"); av_log(avctx, AV_LOG_ERROR,
"Special modes are not supported (yet)\n");
return -1; return -1;
} else { //vertical mode } else { //vertical mode
run = run_off - offs + (cmode - 5); run = run_off - offs + (cmode - 5);
@ -274,8 +277,7 @@ static int find_group3_syncmarker(GetBitContext *gb, int srcsize)
return -1; return -1;
} }
int ff_ccitt_unpack(AVCodecContext *avctx, int ff_ccitt_unpack(AVCodecContext *avctx, const uint8_t *src, int srcsize,
const uint8_t *src, int srcsize,
uint8_t *dst, int height, int stride, uint8_t *dst, int height, int stride,
enum TiffCompr compr, int opts) enum TiffCompr compr, int opts)
{ {
@ -302,19 +304,24 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
for (j = 0; j < height; j++) { for (j = 0; j < height; j++) {
runend = runs + runsize; runend = runs + runsize;
if (compr == TIFF_G4) { if (compr == TIFF_G4) {
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend,
ref);
if (ret < 0) { if (ret < 0) {
err = -1; err = -1;
goto fail; goto fail;
} }
} else { } else {
int g3d1 = (compr == TIFF_G3) && !(opts & 1); int g3d1 = (compr == TIFF_G3) && !(opts & 1);
if(compr!=TIFF_CCITT_RLE && has_eol && find_group3_syncmarker(&gb, srcsize*8) < 0) if (compr != TIFF_CCITT_RLE &&
has_eol &&
find_group3_syncmarker(&gb, srcsize * 8) < 0)
break; break;
if (compr == TIFF_CCITT_RLE || g3d1 || get_bits1(&gb)) if (compr == TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend); ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs,
runend);
else else
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs,
runend, ref);
if (compr == TIFF_CCITT_RLE) if (compr == TIFF_CCITT_RLE)
align_get_bits(&gb); align_get_bits(&gb);
} }