|
|
|
@ -166,17 +166,17 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, |
|
|
|
|
ptr+= linesize; |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
for (i = 0; i < avctx->height; i++) { |
|
|
|
|
for (int i = 0; i < avctx->height; i++) { |
|
|
|
|
if (!upgrade) |
|
|
|
|
samplecpy(ptr, s->bytestream, n, s->maxval); |
|
|
|
|
else if (upgrade == 1) { |
|
|
|
|
unsigned int j, f = (255 * 128 + s->maxval / 2) / s->maxval; |
|
|
|
|
for (j = 0; j < n; j++) |
|
|
|
|
unsigned int f = (255 * 128 + s->maxval / 2) / s->maxval; |
|
|
|
|
for (unsigned j = 0; j < n; j++) |
|
|
|
|
ptr[j] = (s->bytestream[j] * f + 64) >> 7; |
|
|
|
|
} else if (upgrade == 2) { |
|
|
|
|
unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval; |
|
|
|
|
for (j = 0; j < n / 2; j++) { |
|
|
|
|
v = AV_RB16(s->bytestream + 2*j); |
|
|
|
|
unsigned int f = (65535 * 32768 + s->maxval / 2) / s->maxval; |
|
|
|
|
for (unsigned j = 0; j < n / 2; j++) { |
|
|
|
|
unsigned v = AV_RB16(s->bytestream + 2*j); |
|
|
|
|
((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -358,7 +358,8 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, |
|
|
|
|
g += p->linesize[0] / 4; |
|
|
|
|
b += p->linesize[1] / 4; |
|
|
|
|
} |
|
|
|
|
} } |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
case AV_PIX_FMT_GRAYF32: |
|
|
|
|
if (!s->half) { |
|
|
|
|