Skip to content
Snippets Groups Projects
Commit 7c8b273b authored by Måns Rullgård's avatar Måns Rullgård
Browse files

indent 

Originally committed as revision 9616 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ebccac06
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 363 additions and 363 deletions
libavcodec/lcldec.c
+ 363
− 363
View file @ 7c8b273b
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
* Decoder context * Decoder context
*/ */
typedef struct LclDecContext { typedef struct LclDecContext {
AVFrame pic; AVFrame pic;
// Image type // Image type
int imgtype; int imgtype;
...@@ -163,8 +163,8 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha ...@@ -163,8 +163,8 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
*/ */
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
{ {
LclDecContext * const c = avctx->priv_data; LclDecContext * const c = avctx->priv_data;
unsigned char *encoded = (unsigned char *)buf; unsigned char *encoded = (unsigned char *)buf;
unsigned int pixel_ptr; unsigned int pixel_ptr;
int row, col; int row, col;
unsigned char *outptr; unsigned char *outptr;
...@@ -179,327 +179,327 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 ...@@ -179,327 +179,327 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
#endif #endif
unsigned int len = buf_size; unsigned int len = buf_size;
if(c->pic.data[0]) if(c->pic.data[0])
avctx->release_buffer(avctx, &c->pic); avctx->release_buffer(avctx, &c->pic);
c->pic.reference = 0; c->pic.reference = 0;
c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
if(avctx->get_buffer(avctx, &c->pic) < 0){ if(avctx->get_buffer(avctx, &c->pic) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
outptr = c->pic.data[0]; // Output image pointer outptr = c->pic.data[0]; // Output image pointer
/* Decompress frame */ /* Decompress frame */
switch (avctx->codec_id) { switch (avctx->codec_id) {
case CODEC_ID_MSZH: case CODEC_ID_MSZH:
switch (c->compression) { switch (c->compression) {
case COMP_MSZH: case COMP_MSZH:
if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = *((unsigned int*)encoded);
mthread_outlen = *((unsigned int*)(encoded+4));
if (mthread_outlen > c->decomp_size) // this should not happen
mthread_outlen = c->decomp_size;
mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
if (mthread_outlen != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
mthread_outlen, mszh_dlen);
return -1;
}
mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - mthread_inlen,
c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen);
if (mthread_outlen != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n",
mthread_outlen, mszh_dlen);
return -1;
}
encoded = c->decomp_buf;
len = c->decomp_size;
} else {
mszh_dlen = mszh_decomp(encoded, len, c->decomp_buf, c->decomp_size);
if (c->decomp_size != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n",
c->decomp_size, mszh_dlen);
return -1;
}
encoded = c->decomp_buf;
len = mszh_dlen;
}
break;
case COMP_MSZH_NOCOMP:
break;
default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n");
return -1;
}
break;
case CODEC_ID_ZLIB:
#ifdef CONFIG_ZLIB
/* Using the original dll with normal compression (-1) and RGB format
* gives a file with ZLIB fourcc, but frame is really uncompressed.
* To be sure that's true check also frame size */
if ((c->compression == COMP_ZLIB_NORMAL) && (c->imgtype == IMGTYPE_RGB24) &&
(len == width * height * 3))
break;
zret = inflateReset(&(c->zstream));
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
return -1;
}
if (c->flags & FLAG_MULTITHREAD) { if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = *((unsigned int*)encoded); mthread_inlen = *((unsigned int*)encoded);
mthread_outlen = *((unsigned int*)(encoded+4)); mthread_outlen = *((unsigned int*)(encoded+4));
if (mthread_outlen > c->decomp_size) if (mthread_outlen > c->decomp_size) // this should not happen
mthread_outlen = c->decomp_size; mthread_outlen = c->decomp_size;
c->zstream.next_in = encoded + 8; mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
c->zstream.avail_in = mthread_inlen; if (mthread_outlen != mszh_dlen) {
c->zstream.next_out = c->decomp_buf; av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
c->zstream.avail_out = c->decomp_size; mthread_outlen, mszh_dlen);
zret = inflate(&(c->zstream), Z_FINISH);
if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 inflate error: %d\n", zret);
return -1;
}
if (mthread_outlen != (unsigned int)(c->zstream.total_out)) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%u != %lu)\n",
mthread_outlen, c->zstream.total_out);
return -1;
}
zret = inflateReset(&(c->zstream));
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate reset error: %d\n", zret);
return -1;
}
c->zstream.next_in = encoded + 8 + mthread_inlen;
c->zstream.avail_in = len - mthread_inlen;
c->zstream.next_out = c->decomp_buf + mthread_outlen;
c->zstream.avail_out = c->decomp_size - mthread_outlen;
zret = inflate(&(c->zstream), Z_FINISH);
if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate error: %d\n", zret);
return -1; return -1;
} }
if (mthread_outlen != (unsigned int)(c->zstream.total_out)) { mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - mthread_inlen,
av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %lu)\n", c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen);
mthread_outlen, c->zstream.total_out); if (mthread_outlen != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n",
mthread_outlen, mszh_dlen);
return -1; return -1;
} }
encoded = c->decomp_buf;
len = c->decomp_size;
} else { } else {
c->zstream.next_in = encoded; mszh_dlen = mszh_decomp(encoded, len, c->decomp_buf, c->decomp_size);
c->zstream.avail_in = len; if (c->decomp_size != mszh_dlen) {
c->zstream.next_out = c->decomp_buf; av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n",
c->zstream.avail_out = c->decomp_size; c->decomp_size, mszh_dlen);
zret = inflate(&(c->zstream), Z_FINISH);
if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret);
return -1;
}
if (c->decomp_size != (unsigned int)(c->zstream.total_out)) {
av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n",
c->decomp_size, c->zstream.total_out);
return -1; return -1;
} }
encoded = c->decomp_buf;
len = mszh_dlen;
} }
encoded = c->decomp_buf; break;
len = c->decomp_size;; case COMP_MSZH_NOCOMP:
#else
av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n");
return -1;
#endif
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n"); av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n");
return -1;
}
break;
case CODEC_ID_ZLIB:
#ifdef CONFIG_ZLIB
/* Using the original dll with normal compression (-1) and RGB format
* gives a file with ZLIB fourcc, but frame is really uncompressed.
* To be sure that's true check also frame size */
if ((c->compression == COMP_ZLIB_NORMAL) && (c->imgtype == IMGTYPE_RGB24) &&
(len == width * height * 3))
break;
zret = inflateReset(&(c->zstream));
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
return -1; return -1;
}
if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = *((unsigned int*)encoded);
mthread_outlen = *((unsigned int*)(encoded+4));
if (mthread_outlen > c->decomp_size)
mthread_outlen = c->decomp_size;
c->zstream.next_in = encoded + 8;
c->zstream.avail_in = mthread_inlen;
c->zstream.next_out = c->decomp_buf;
c->zstream.avail_out = c->decomp_size;
zret = inflate(&(c->zstream), Z_FINISH);
if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 inflate error: %d\n", zret);
return -1;
}
if (mthread_outlen != (unsigned int)(c->zstream.total_out)) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%u != %lu)\n",
mthread_outlen, c->zstream.total_out);
return -1;
}
zret = inflateReset(&(c->zstream));
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate reset error: %d\n", zret);
return -1;
}
c->zstream.next_in = encoded + 8 + mthread_inlen;
c->zstream.avail_in = len - mthread_inlen;
c->zstream.next_out = c->decomp_buf + mthread_outlen;
c->zstream.avail_out = c->decomp_size - mthread_outlen;
zret = inflate(&(c->zstream), Z_FINISH);
if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate error: %d\n", zret);
return -1;
}
if (mthread_outlen != (unsigned int)(c->zstream.total_out)) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %lu)\n",
mthread_outlen, c->zstream.total_out);
return -1;
}
} else {
c->zstream.next_in = encoded;
c->zstream.avail_in = len;
c->zstream.next_out = c->decomp_buf;
c->zstream.avail_out = c->decomp_size;
zret = inflate(&(c->zstream), Z_FINISH);
if ((zret != Z_OK) && (zret != Z_STREAM_END)) {
av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret);
return -1;
}
if (c->decomp_size != (unsigned int)(c->zstream.total_out)) {
av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n",
c->decomp_size, c->zstream.total_out);
return -1;
}
}
encoded = c->decomp_buf;
len = c->decomp_size;;
#else
av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n");
return -1;
#endif
break;
default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n");
return -1;
} }
/* Apply PNG filter */ /* Apply PNG filter */
if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER)) { if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER)) {
switch (c->imgtype) { switch (c->imgtype) {
case IMGTYPE_YUV111:
case IMGTYPE_RGB24:
for (row = 0; row < height; row++) {
pixel_ptr = row * width * 3;
yq = encoded[pixel_ptr++];
uqvq = AV_RL16(encoded+pixel_ptr);
pixel_ptr += 2;
for (col = 1; col < width; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
uqvq -= AV_RL16(encoded+pixel_ptr+1);
AV_WL16(encoded+pixel_ptr+1, uqvq);
pixel_ptr += 3;
}
}
break;
case IMGTYPE_YUV422:
for (row = 0; row < height; row++) {
pixel_ptr = row * width * 2;
yq = uq = vq =0;
for (col = 0; col < width/4; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2];
encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3];
encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
encoded[pixel_ptr+5] = uq -= encoded[pixel_ptr+5];
encoded[pixel_ptr+6] = vq -= encoded[pixel_ptr+6];
encoded[pixel_ptr+7] = vq -= encoded[pixel_ptr+7];
pixel_ptr += 8;
}
}
break;
case IMGTYPE_YUV411:
for (row = 0; row < height; row++) {
pixel_ptr = row * width / 2 * 3;
yq = uq = vq =0;
for (col = 0; col < width/4; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2];
encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3];
encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5];
pixel_ptr += 6;
}
}
break;
case IMGTYPE_YUV211:
for (row = 0; row < height; row++) {
pixel_ptr = row * width * 2;
yq = uq = vq =0;
for (col = 0; col < width/2; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
encoded[pixel_ptr+2] = uq -= encoded[pixel_ptr+2];
encoded[pixel_ptr+3] = vq -= encoded[pixel_ptr+3];
pixel_ptr += 4;
}
}
break;
case IMGTYPE_YUV420:
for (row = 0; row < height/2; row++) {
pixel_ptr = row * width * 3;
yq = y1q = uq = vq =0;
for (col = 0; col < width/2; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
encoded[pixel_ptr+2] = y1q -= encoded[pixel_ptr+2];
encoded[pixel_ptr+3] = y1q -= encoded[pixel_ptr+3];
encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5];
pixel_ptr += 6;
}
}
break;
default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n");
return -1;
}
}
/* Convert colorspace */
switch (c->imgtype) {
case IMGTYPE_YUV111: case IMGTYPE_YUV111:
for (row = height - 1; row >= 0; row--) { case IMGTYPE_RGB24:
pixel_ptr = row * c->pic.linesize[0]; for (row = 0; row < height; row++) {
for (col = 0; col < width; col++) { pixel_ptr = row * width * 3;
outptr[pixel_ptr++] = get_b(encoded[0], encoded[1]); yq = encoded[pixel_ptr++];
outptr[pixel_ptr++] = get_g(encoded[0], encoded[1], encoded[2]); uqvq = AV_RL16(encoded+pixel_ptr);
outptr[pixel_ptr++] = get_r(encoded[0], encoded[2]); pixel_ptr += 2;
encoded += 3; for (col = 1; col < width; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
uqvq -= AV_RL16(encoded+pixel_ptr+1);
AV_WL16(encoded+pixel_ptr+1, uqvq);
pixel_ptr += 3;
} }
} }
break; break;
case IMGTYPE_YUV422: case IMGTYPE_YUV422:
for (row = height - 1; row >= 0; row--) { for (row = 0; row < height; row++) {
pixel_ptr = row * c->pic.linesize[0]; pixel_ptr = row * width * 2;
yq = uq = vq =0;
for (col = 0; col < width/4; col++) { for (col = 0; col < width/4; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[4]); encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
outptr[pixel_ptr++] = get_g(encoded[0], encoded[4], encoded[6]); encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
outptr[pixel_ptr++] = get_r(encoded[0], encoded[6]); encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2];
outptr[pixel_ptr++] = get_b(encoded[1], encoded[4]); encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3];
outptr[pixel_ptr++] = get_g(encoded[1], encoded[4], encoded[6]); encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
outptr[pixel_ptr++] = get_r(encoded[1], encoded[6]); encoded[pixel_ptr+5] = uq -= encoded[pixel_ptr+5];
outptr[pixel_ptr++] = get_b(encoded[2], encoded[5]); encoded[pixel_ptr+6] = vq -= encoded[pixel_ptr+6];
outptr[pixel_ptr++] = get_g(encoded[2], encoded[5], encoded[7]); encoded[pixel_ptr+7] = vq -= encoded[pixel_ptr+7];
outptr[pixel_ptr++] = get_r(encoded[2], encoded[7]); pixel_ptr += 8;
outptr[pixel_ptr++] = get_b(encoded[3], encoded[5]);
outptr[pixel_ptr++] = get_g(encoded[3], encoded[5], encoded[7]);
outptr[pixel_ptr++] = get_r(encoded[3], encoded[7]);
encoded += 8;
}
}
break;
case IMGTYPE_RGB24:
for (row = height - 1; row >= 0; row--) {
pixel_ptr = row * c->pic.linesize[0];
for (col = 0; col < width; col++) {
outptr[pixel_ptr++] = encoded[0];
outptr[pixel_ptr++] = encoded[1];
outptr[pixel_ptr++] = encoded[2];
encoded += 3;
} }
} }
break; break;
case IMGTYPE_YUV411: case IMGTYPE_YUV411:
for (row = height - 1; row >= 0; row--) { for (row = 0; row < height; row++) {
pixel_ptr = row * c->pic.linesize[0]; pixel_ptr = row * width / 2 * 3;
yq = uq = vq =0;
for (col = 0; col < width/4; col++) { for (col = 0; col < width/4; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[4]); encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
outptr[pixel_ptr++] = get_g(encoded[0], encoded[4], encoded[5]); encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
outptr[pixel_ptr++] = get_r(encoded[0], encoded[5]); encoded[pixel_ptr+2] = yq -= encoded[pixel_ptr+2];
outptr[pixel_ptr++] = get_b(encoded[1], encoded[4]); encoded[pixel_ptr+3] = yq -= encoded[pixel_ptr+3];
outptr[pixel_ptr++] = get_g(encoded[1], encoded[4], encoded[5]); encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
outptr[pixel_ptr++] = get_r(encoded[1], encoded[5]); encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5];
outptr[pixel_ptr++] = get_b(encoded[2], encoded[4]); pixel_ptr += 6;
outptr[pixel_ptr++] = get_g(encoded[2], encoded[4], encoded[5]);
outptr[pixel_ptr++] = get_r(encoded[2], encoded[5]);
outptr[pixel_ptr++] = get_b(encoded[3], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[3], encoded[4], encoded[5]);
outptr[pixel_ptr++] = get_r(encoded[3], encoded[5]);
encoded += 6;
} }
} }
break; break;
case IMGTYPE_YUV211: case IMGTYPE_YUV211:
for (row = height - 1; row >= 0; row--) { for (row = 0; row < height; row++) {
pixel_ptr = row * c->pic.linesize[0]; pixel_ptr = row * width * 2;
yq = uq = vq =0;
for (col = 0; col < width/2; col++) { for (col = 0; col < width/2; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[2]); encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
outptr[pixel_ptr++] = get_g(encoded[0], encoded[2], encoded[3]); encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
outptr[pixel_ptr++] = get_r(encoded[0], encoded[3]); encoded[pixel_ptr+2] = uq -= encoded[pixel_ptr+2];
outptr[pixel_ptr++] = get_b(encoded[1], encoded[2]); encoded[pixel_ptr+3] = vq -= encoded[pixel_ptr+3];
outptr[pixel_ptr++] = get_g(encoded[1], encoded[2], encoded[3]); pixel_ptr += 4;
outptr[pixel_ptr++] = get_r(encoded[1], encoded[3]);
encoded += 4;
} }
} }
break; break;
case IMGTYPE_YUV420: case IMGTYPE_YUV420:
for (row = height / 2 - 1; row >= 0; row--) { for (row = 0; row < height/2; row++) {
pixel_ptr = 2 * row * c->pic.linesize[0]; pixel_ptr = row * width * 3;
yq = y1q = uq = vq =0;
for (col = 0; col < width/2; col++) { for (col = 0; col < width/2; col++) {
outptr[pixel_ptr] = get_b(encoded[0], encoded[4]); encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
outptr[pixel_ptr+1] = get_g(encoded[0], encoded[4], encoded[5]); encoded[pixel_ptr+1] = yq -= encoded[pixel_ptr+1];
outptr[pixel_ptr+2] = get_r(encoded[0], encoded[5]); encoded[pixel_ptr+2] = y1q -= encoded[pixel_ptr+2];
outptr[pixel_ptr+3] = get_b(encoded[1], encoded[4]); encoded[pixel_ptr+3] = y1q -= encoded[pixel_ptr+3];
outptr[pixel_ptr+4] = get_g(encoded[1], encoded[4], encoded[5]); encoded[pixel_ptr+4] = uq -= encoded[pixel_ptr+4];
outptr[pixel_ptr+5] = get_r(encoded[1], encoded[5]); encoded[pixel_ptr+5] = vq -= encoded[pixel_ptr+5];
outptr[pixel_ptr-c->pic.linesize[0]] = get_b(encoded[2], encoded[4]);
outptr[pixel_ptr-c->pic.linesize[0]+1] = get_g(encoded[2], encoded[4], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]+2] = get_r(encoded[2], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]+3] = get_b(encoded[3], encoded[4]);
outptr[pixel_ptr-c->pic.linesize[0]+4] = get_g(encoded[3], encoded[4], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]+5] = get_r(encoded[3], encoded[5]);
pixel_ptr += 6; pixel_ptr += 6;
encoded += 6;
} }
} }
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n"); av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n");
return -1; return -1;
}
}
/* Convert colorspace */
switch (c->imgtype) {
case IMGTYPE_YUV111:
for (row = height - 1; row >= 0; row--) {
pixel_ptr = row * c->pic.linesize[0];
for (col = 0; col < width; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[1]);
outptr[pixel_ptr++] = get_g(encoded[0], encoded[1], encoded[2]);
outptr[pixel_ptr++] = get_r(encoded[0], encoded[2]);
encoded += 3;
}
}
break;
case IMGTYPE_YUV422:
for (row = height - 1; row >= 0; row--) {
pixel_ptr = row * c->pic.linesize[0];
for (col = 0; col < width/4; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[0], encoded[4], encoded[6]);
outptr[pixel_ptr++] = get_r(encoded[0], encoded[6]);
outptr[pixel_ptr++] = get_b(encoded[1], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[1], encoded[4], encoded[6]);
outptr[pixel_ptr++] = get_r(encoded[1], encoded[6]);
outptr[pixel_ptr++] = get_b(encoded[2], encoded[5]);
outptr[pixel_ptr++] = get_g(encoded[2], encoded[5], encoded[7]);
outptr[pixel_ptr++] = get_r(encoded[2], encoded[7]);
outptr[pixel_ptr++] = get_b(encoded[3], encoded[5]);
outptr[pixel_ptr++] = get_g(encoded[3], encoded[5], encoded[7]);
outptr[pixel_ptr++] = get_r(encoded[3], encoded[7]);
encoded += 8;
}
}
break;
case IMGTYPE_RGB24:
for (row = height - 1; row >= 0; row--) {
pixel_ptr = row * c->pic.linesize[0];
for (col = 0; col < width; col++) {
outptr[pixel_ptr++] = encoded[0];
outptr[pixel_ptr++] = encoded[1];
outptr[pixel_ptr++] = encoded[2];
encoded += 3;
}
}
break;
case IMGTYPE_YUV411:
for (row = height - 1; row >= 0; row--) {
pixel_ptr = row * c->pic.linesize[0];
for (col = 0; col < width/4; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[0], encoded[4], encoded[5]);
outptr[pixel_ptr++] = get_r(encoded[0], encoded[5]);
outptr[pixel_ptr++] = get_b(encoded[1], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[1], encoded[4], encoded[5]);
outptr[pixel_ptr++] = get_r(encoded[1], encoded[5]);
outptr[pixel_ptr++] = get_b(encoded[2], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[2], encoded[4], encoded[5]);
outptr[pixel_ptr++] = get_r(encoded[2], encoded[5]);
outptr[pixel_ptr++] = get_b(encoded[3], encoded[4]);
outptr[pixel_ptr++] = get_g(encoded[3], encoded[4], encoded[5]);
outptr[pixel_ptr++] = get_r(encoded[3], encoded[5]);
encoded += 6;
}
}
break;
case IMGTYPE_YUV211:
for (row = height - 1; row >= 0; row--) {
pixel_ptr = row * c->pic.linesize[0];
for (col = 0; col < width/2; col++) {
outptr[pixel_ptr++] = get_b(encoded[0], encoded[2]);
outptr[pixel_ptr++] = get_g(encoded[0], encoded[2], encoded[3]);
outptr[pixel_ptr++] = get_r(encoded[0], encoded[3]);
outptr[pixel_ptr++] = get_b(encoded[1], encoded[2]);
outptr[pixel_ptr++] = get_g(encoded[1], encoded[2], encoded[3]);
outptr[pixel_ptr++] = get_r(encoded[1], encoded[3]);
encoded += 4;
}
}
break;
case IMGTYPE_YUV420:
for (row = height / 2 - 1; row >= 0; row--) {
pixel_ptr = 2 * row * c->pic.linesize[0];
for (col = 0; col < width/2; col++) {
outptr[pixel_ptr] = get_b(encoded[0], encoded[4]);
outptr[pixel_ptr+1] = get_g(encoded[0], encoded[4], encoded[5]);
outptr[pixel_ptr+2] = get_r(encoded[0], encoded[5]);
outptr[pixel_ptr+3] = get_b(encoded[1], encoded[4]);
outptr[pixel_ptr+4] = get_g(encoded[1], encoded[4], encoded[5]);
outptr[pixel_ptr+5] = get_r(encoded[1], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]] = get_b(encoded[2], encoded[4]);
outptr[pixel_ptr-c->pic.linesize[0]+1] = get_g(encoded[2], encoded[4], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]+2] = get_r(encoded[2], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]+3] = get_b(encoded[3], encoded[4]);
outptr[pixel_ptr-c->pic.linesize[0]+4] = get_g(encoded[3], encoded[4], encoded[5]);
outptr[pixel_ptr-c->pic.linesize[0]+5] = get_r(encoded[3], encoded[5]);
pixel_ptr += 6;
encoded += 6;
}
}
break;
default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n");
return -1;
} }
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
...@@ -546,85 +546,85 @@ static int decode_init(AVCodecContext *avctx) ...@@ -546,85 +546,85 @@ static int decode_init(AVCodecContext *avctx)
/* Detect image type */ /* Detect image type */
switch (c->imgtype = *((char *)avctx->extradata + 4)) { switch (c->imgtype = *((char *)avctx->extradata + 4)) {
case IMGTYPE_YUV111: case IMGTYPE_YUV111:
c->decomp_size = basesize * 3; c->decomp_size = basesize * 3;
max_decomp_size = max_basesize * 3; max_decomp_size = max_basesize * 3;
av_log(avctx, AV_LOG_INFO, "Image type is YUV 1:1:1.\n"); av_log(avctx, AV_LOG_INFO, "Image type is YUV 1:1:1.\n");
break; break;
case IMGTYPE_YUV422: case IMGTYPE_YUV422:
c->decomp_size = basesize * 2; c->decomp_size = basesize * 2;
max_decomp_size = max_basesize * 2; max_decomp_size = max_basesize * 2;
av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:2.\n"); av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:2.\n");
break; break;
case IMGTYPE_RGB24: case IMGTYPE_RGB24:
c->decomp_size = basesize * 3; c->decomp_size = basesize * 3;
max_decomp_size = max_basesize * 3; max_decomp_size = max_basesize * 3;
av_log(avctx, AV_LOG_INFO, "Image type is RGB 24.\n"); av_log(avctx, AV_LOG_INFO, "Image type is RGB 24.\n");
break; break;
case IMGTYPE_YUV411: case IMGTYPE_YUV411:
c->decomp_size = basesize / 2 * 3; c->decomp_size = basesize / 2 * 3;
max_decomp_size = max_basesize / 2 * 3; max_decomp_size = max_basesize / 2 * 3;
av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:1:1.\n"); av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:1:1.\n");
break; break;
case IMGTYPE_YUV211: case IMGTYPE_YUV211:
c->decomp_size = basesize * 2; c->decomp_size = basesize * 2;
max_decomp_size = max_basesize * 2; max_decomp_size = max_basesize * 2;
av_log(avctx, AV_LOG_INFO, "Image type is YUV 2:1:1.\n"); av_log(avctx, AV_LOG_INFO, "Image type is YUV 2:1:1.\n");
break; break;
case IMGTYPE_YUV420: case IMGTYPE_YUV420:
c->decomp_size = basesize / 2 * 3; c->decomp_size = basesize / 2 * 3;
max_decomp_size = max_basesize / 2 * 3; max_decomp_size = max_basesize / 2 * 3;
av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:0.\n"); av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:0.\n");
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype); av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype);
return 1; return 1;
} }
/* Detect compression method */ /* Detect compression method */
c->compression = *((char *)avctx->extradata + 5); c->compression = *((char *)avctx->extradata + 5);
switch (avctx->codec_id) { switch (avctx->codec_id) {
case CODEC_ID_MSZH: case CODEC_ID_MSZH:
switch (c->compression) { switch (c->compression) {
case COMP_MSZH: case COMP_MSZH:
av_log(avctx, AV_LOG_INFO, "Compression enabled.\n"); av_log(avctx, AV_LOG_INFO, "Compression enabled.\n");
break;
case COMP_MSZH_NOCOMP:
c->decomp_size = 0;
av_log(avctx, AV_LOG_INFO, "No compression.\n");
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression);
return 1;
}
break; break;
case CODEC_ID_ZLIB: case COMP_MSZH_NOCOMP:
c->decomp_size = 0;
av_log(avctx, AV_LOG_INFO, "No compression.\n");
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression);
return 1;
}
break;
case CODEC_ID_ZLIB:
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
switch (c->compression) { switch (c->compression) {
case COMP_ZLIB_HISPEED: case COMP_ZLIB_HISPEED:
av_log(avctx, AV_LOG_INFO, "High speed compression.\n"); av_log(avctx, AV_LOG_INFO, "High speed compression.\n");
break; break;
case COMP_ZLIB_HICOMP: case COMP_ZLIB_HICOMP:
av_log(avctx, AV_LOG_INFO, "High compression.\n"); av_log(avctx, AV_LOG_INFO, "High compression.\n");
break; break;
case COMP_ZLIB_NORMAL: case COMP_ZLIB_NORMAL:
av_log(avctx, AV_LOG_INFO, "Normal compression.\n"); av_log(avctx, AV_LOG_INFO, "Normal compression.\n");
break; break;
default: default:
if ((c->compression < Z_NO_COMPRESSION) || (c->compression > Z_BEST_COMPRESSION)) { if ((c->compression < Z_NO_COMPRESSION) || (c->compression > Z_BEST_COMPRESSION)) {
av_log(avctx, AV_LOG_ERROR, "Unsupported compression level for ZLIB: (%d).\n", c->compression); av_log(avctx, AV_LOG_ERROR, "Unsupported compression level for ZLIB: (%d).\n", c->compression);
return 1; return 1;
}
av_log(avctx, AV_LOG_INFO, "Compression level for ZLIB: (%d).\n", c->compression);
} }
av_log(avctx, AV_LOG_INFO, "Compression level for ZLIB: (%d).\n", c->compression);
}
#else #else
av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
return 1; return 1;
#endif #endif
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n"); av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n");
return 1; return 1;
} }
/* Allocate decompression buffer */ /* Allocate decompression buffer */
...@@ -658,8 +658,8 @@ static int decode_init(AVCodecContext *avctx) ...@@ -658,8 +658,8 @@ static int decode_init(AVCodecContext *avctx)
return 1; return 1;
} }
#else #else
av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
return 1; return 1;
#endif #endif
} }
...@@ -675,41 +675,41 @@ static int decode_init(AVCodecContext *avctx) ...@@ -675,41 +675,41 @@ static int decode_init(AVCodecContext *avctx)
*/ */
static int decode_end(AVCodecContext *avctx) static int decode_end(AVCodecContext *avctx)
{ {
LclDecContext * const c = avctx->priv_data; LclDecContext * const c = avctx->priv_data;
if (c->pic.data[0]) if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic); avctx->release_buffer(avctx, &c->pic);
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
inflateEnd(&(c->zstream)); inflateEnd(&(c->zstream));
#endif #endif
return 0; return 0;
} }
#ifdef CONFIG_MSZH_DECODER #ifdef CONFIG_MSZH_DECODER
AVCodec mszh_decoder = { AVCodec mszh_decoder = {
"mszh", "mszh",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
CODEC_ID_MSZH, CODEC_ID_MSZH,
sizeof(LclDecContext), sizeof(LclDecContext),
decode_init, decode_init,
NULL, NULL,
decode_end, decode_end,
decode_frame, decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
}; };
#endif #endif
#ifdef CONFIG_ZLIB_DECODER #ifdef CONFIG_ZLIB_DECODER
AVCodec zlib_decoder = { AVCodec zlib_decoder = {
"zlib", "zlib",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
CODEC_ID_ZLIB, CODEC_ID_ZLIB,
sizeof(LclDecContext), sizeof(LclDecContext),
decode_init, decode_init,
NULL, NULL,
decode_end, decode_end,
decode_frame, decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
}; };
#endif #endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment