*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
* and enhanced to bigger color depths
*
*/
-
-static int decode_rle(CamtasiaContext *c)
+
+static int decode_rle(CamtasiaContext *c, unsigned int srcsize)
{
unsigned char *src = c->decomp_buf;
- unsigned char *output;
+ unsigned char *output, *output_end;
int p1, p2, line=c->height, pos=0, i;
-
+ uint16_t pix16;
+ uint32_t pix32;
+
output = c->pic.data[0] + (c->height - 1) * c->pic.linesize[0];
- while(src < c->decomp_buf + c->decomp_size) {
+ output_end = c->pic.data[0] + (c->height) * c->pic.linesize[0];
+ while(src < c->decomp_buf + srcsize) {
p1 = *src++;
if(p1 == 0) { //Escape code
p2 = *src++;
if(p2 == 0) { //End-of-line
output = c->pic.data[0] + (--line) * c->pic.linesize[0];
+ if (line < 0)
+ return -1;
pos = 0;
continue;
} else if(p2 == 1) { //End-of-picture
p1 = *src++;
p2 = *src++;
line -= p2;
+ if (line < 0)
+ return -1;
pos += p1;
output = c->pic.data[0] + line * c->pic.linesize[0] + pos * (c->bpp / 8);
continue;
}
// Copy data
- for(i = 0; i < p2 * (c->bpp / 8); i++) {
- *output++ = *src++;
+ if (output + p2 * (c->bpp / 8) > output_end) {
+ src += p2 * (c->bpp / 8);
+ continue;
+ }
+ if ((c->bpp == 8) || (c->bpp == 24)) {
+ for(i = 0; i < p2 * (c->bpp / 8); i++) {
+ *output++ = *src++;
+ }
+ // RLE8 copy is actually padded - and runs are not!
+ if(c->bpp == 8 && (p2 & 1)) {
+ src++;
+ }
+ } else if (c->bpp == 16) {
+ for(i = 0; i < p2; i++) {
+ pix16 = LE_16(src);
+ src += 2;
+ *(uint16_t*)output = pix16;
+ output += 2;
+ }
+ } else if (c->bpp == 32) {
+ for(i = 0; i < p2; i++) {
+ pix32 = LE_32(src);
+ src += 4;
+ *(uint32_t*)output = pix32;
+ output += 4;
+ }
}
- // RLE8 copy is actually padded - and runs are not!
- if(c->bpp == 8 && (p2 & 1)) {
- src++;
- }
pos += p2;
} else { //Run of pixels
- int pix[3]; //original pixel
+ int pix[4]; //original pixel
switch(c->bpp){
case 8: pix[0] = *src++;
break;
- case 16: pix[0] = *src++;
- pix[1] = *src++;
+ case 16: pix16 = LE_16(src);
+ src += 2;
+ *(uint16_t*)pix = pix16;
break;
case 24: pix[0] = *src++;
pix[1] = *src++;
pix[2] = *src++;
break;
+ case 32: pix32 = LE_32(src);
+ src += 4;
+ *(uint32_t*)pix = pix32;
+ break;
}
+ if (output + p1 * (c->bpp / 8) > output_end)
+ continue;
for(i = 0; i < p1; i++) {
switch(c->bpp){
case 8: *output++ = pix[0];
break;
- case 16: *output++ = pix[0];
- *output++ = pix[1];
+ case 16: *(uint16_t*)output = pix16;
+ output += 2;
break;
case 24: *output++ = pix[0];
*output++ = pix[1];
*output++ = pix[2];
break;
+ case 32: *(uint32_t*)output = pix32;
+ output += 4;
+ break;
}
}
pos += p1;
}
}
-
- av_log(c->avctx, AV_LOG_ERROR, "Camtasia warning: no End-of-picture code\n");
+
+ av_log(c->avctx, AV_LOG_ERROR, "Camtasia warning: no End-of-picture code\n");
return 1;
}
#endif
int len = buf_size;
- /* no supplementary picture */
- if (buf_size == 0)
- return 0;
-
if(c->pic.data[0])
avctx->release_buffer(avctx, &c->pic);
av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret);
return -1;
}
- encoded = c->decomp_buf;
- len = c->decomp_size;
+
+
if(zret != Z_DATA_ERROR)
- decode_rle(c);
-
+ decode_rle(c, c->zstream.avail_out);
+
/* make the palette available on the way out */
if (c->avctx->pix_fmt == PIX_FMT_PAL8) {
memcpy(c->pic.data[1], c->avctx->palctrl->palette, AVPALETTE_SIZE);
c->pic.data[0] = NULL;
c->height = avctx->height;
+ if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) {
+ return 1;
+ }
+
#ifdef CONFIG_ZLIB
// Needed if zlib unused or init aborted before inflateInit
- memset(&(c->zstream), 0, sizeof(z_stream));
+ memset(&(c->zstream), 0, sizeof(z_stream));
#else
av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
return 1;
switch(avctx->bits_per_sample){
case 8: avctx->pix_fmt = PIX_FMT_PAL8; break;
case 16: avctx->pix_fmt = PIX_FMT_RGB555; break;
- case 24: av_log(avctx, AV_LOG_ERROR, "Camtasia warning: RGB24 is just guessed\n");
+ case 24:
avctx->pix_fmt = PIX_FMT_BGR24;
break;
+ case 32: avctx->pix_fmt = PIX_FMT_RGBA32; break;
default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_sample);
- return -1;
+ return -1;
}
c->bpp = avctx->bits_per_sample;
c->decomp_size = (avctx->width * c->bpp + (avctx->width + 254) / 255 + 2) * avctx->height + 2;//RLE in the 'best' case
return 1;
}
}
-
+
#ifdef CONFIG_ZLIB
c->zstream.zalloc = Z_NULL;
c->zstream.zfree = Z_NULL;
{
CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data;
+ av_freep(&c->decomp_buf);
+
if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic);
#ifdef CONFIG_ZLIB
projects / ffmpeg / blobdiff