har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/pnmdec: Fix indentation

Browse Source 
Forgotten after ff1450e449f848ad4b37b3cf448315ba4581364e.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-07-26 00:48:41 +02:00
parent 22ca2ef018
commit e4547c136a
1 changed files with 70 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
libavcodec/pnmdec.c
View File

@ -166,23 +166,23 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
ptr+= linesize; ptr+= linesize;
} }
}else{ }else{
for (i = 0; i < avctx->height; i++) { for (int i = 0; i < avctx->height; i++) {
if (!upgrade) if (!upgrade)
samplecpy(ptr, s->bytestream, n, s->maxval); samplecpy(ptr, s->bytestream, n, s->maxval);
else if (upgrade == 1) { else if (upgrade == 1) {
unsigned int j, f = (255 * 128 + s->maxval / 2) / s->maxval; unsigned int f = (255 * 128 + s->maxval / 2) / s->maxval;
for (j = 0; j < n; j++) for (unsigned j = 0; j < n; j++)
ptr[j] = (s->bytestream[j] * f + 64) >> 7; ptr[j] = (s->bytestream[j] * f + 64) >> 7;
} else if (upgrade == 2) { } else if (upgrade == 2) {
unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval; unsigned int f = (65535 * 32768 + s->maxval / 2) / s->maxval;
for (j = 0; j < n / 2; j++) { for (unsigned j = 0; j < n / 2; j++) {
v = AV_RB16(s->bytestream + 2*j); unsigned v = AV_RB16(s->bytestream + 2*j);
((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15;
}
} }
s->bytestream += n;
ptr += linesize;
} }
s->bytestream += n;
ptr += linesize;
}
} }
break; break;
case AV_PIX_FMT_YUV420P: case AV_PIX_FMT_YUV420P:
@ -260,46 +260,46 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
break; break;
case AV_PIX_FMT_GBRPF32: case AV_PIX_FMT_GBRPF32:
if (!s->half) { if (!s->half) {
if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream) if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
scale = 1.f / s->scale; scale = 1.f / s->scale;
if (s->endian) { if (s->endian) {
float *r, *g, *b; float *r, *g, *b;
r = (float *)p->data[2]; r = (float *)p->data[2];
g = (float *)p->data[0]; g = (float *)p->data[0];
b = (float *)p->data[1]; b = (float *)p->data[1];
for (int i = 0; i < avctx->height; i++) { for (int i = 0; i < avctx->height; i++) {
for (int j = 0; j < avctx->width; j++) { for (int j = 0; j < avctx->width; j++) {
r[j] = av_int2float(AV_RL32(s->bytestream+0)) * scale; r[j] = av_int2float(AV_RL32(s->bytestream+0)) * scale;
g[j] = av_int2float(AV_RL32(s->bytestream+4)) * scale; g[j] = av_int2float(AV_RL32(s->bytestream+4)) * scale;
b[j] = av_int2float(AV_RL32(s->bytestream+8)) * scale; b[j] = av_int2float(AV_RL32(s->bytestream+8)) * scale;
s->bytestream += 12; s->bytestream += 12;
}
r += p->linesize[2] / 4;
g += p->linesize[0] / 4;
b += p->linesize[1] / 4;
} }
} else {
float *r, *g, *b;
r += p->linesize[2] / 4; r = (float *)p->data[2];
g += p->linesize[0] / 4; g = (float *)p->data[0];
b += p->linesize[1] / 4; b = (float *)p->data[1];
} for (int i = 0; i < avctx->height; i++) {
} else { for (int j = 0; j < avctx->width; j++) {
float *r, *g, *b; r[j] = av_int2float(AV_RB32(s->bytestream+0)) * scale;
g[j] = av_int2float(AV_RB32(s->bytestream+4)) * scale;
b[j] = av_int2float(AV_RB32(s->bytestream+8)) * scale;
s->bytestream += 12;
}
r = (float *)p->data[2]; r += p->linesize[2] / 4;
g = (float *)p->data[0]; g += p->linesize[0] / 4;
b = (float *)p->data[1]; b += p->linesize[1] / 4;
for (int i = 0; i < avctx->height; i++) {
for (int j = 0; j < avctx->width; j++) {
r[j] = av_int2float(AV_RB32(s->bytestream+0)) * scale;
g[j] = av_int2float(AV_RB32(s->bytestream+4)) * scale;
b[j] = av_int2float(AV_RB32(s->bytestream+8)) * scale;
s->bytestream += 12;
} }
r += p->linesize[2] / 4;
g += p->linesize[0] / 4;
b += p->linesize[1] / 4;
} }
}
} else { } else {
if (avctx->width * avctx->height * 6 > s->bytestream_end - s->bytestream) if (avctx->width * avctx->height * 6 > s->bytestream_end - s->bytestream)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -358,32 +358,33 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
g += p->linesize[0] / 4; g += p->linesize[0] / 4;
b += p->linesize[1] / 4; b += p->linesize[1] / 4;
} }
} } }
}
break; break;
case AV_PIX_FMT_GRAYF32: case AV_PIX_FMT_GRAYF32:
if (!s->half) { if (!s->half) {
if (avctx->width * avctx->height * 4 > s->bytestream_end - s->bytestream) if (avctx->width * avctx->height * 4 > s->bytestream_end - s->bytestream)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
scale = 1.f / s->scale; scale = 1.f / s->scale;
if (s->endian) { if (s->endian) {
float *g = (float *)p->data[0]; float *g = (float *)p->data[0];
for (int i = 0; i < avctx->height; i++) { for (int i = 0; i < avctx->height; i++) {
for (int j = 0; j < avctx->width; j++) { for (int j = 0; j < avctx->width; j++) {
g[j] = av_int2float(AV_RL32(s->bytestream)) * scale; g[j] = av_int2float(AV_RL32(s->bytestream)) * scale;
s->bytestream += 4; s->bytestream += 4;
}
g += p->linesize[0] / 4;
} }
g += p->linesize[0] / 4; } else {
} float *g = (float *)p->data[0];
} else { for (int i = 0; i < avctx->height; i++) {
float *g = (float *)p->data[0]; for (int j = 0; j < avctx->width; j++) {
for (int i = 0; i < avctx->height; i++) { g[j] = av_int2float(AV_RB32(s->bytestream)) * scale;
for (int j = 0; j < avctx->width; j++) { s->bytestream += 4;
g[j] = av_int2float(AV_RB32(s->bytestream)) * scale; }
s->bytestream += 4; g += p->linesize[0] / 4;
} }
g += p->linesize[0] / 4;
} }
}
} else { } else {
if (avctx->width * avctx->height * 2 > s->bytestream_end - s->bytestream) if (avctx->width * avctx->height * 2 > s->bytestream_end - s->bytestream)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;