* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
- AV_LE2ME64C(UINT64_C(0x0000000)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1000000)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0010000)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1010000)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0000100)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1000100)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0010100)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1010100)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0000001)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1000001)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0010001)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1010001)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0000101)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1000101)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x0010101)<<32 | v) << plane, \
- AV_LE2ME64C(UINT64_C(0x1010101)<<32 | v) << plane
+ AV_LE2NE64C(UINT64_C(0x0000000)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1000000)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0010000)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1010000)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0000100)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1000100)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0010100)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1010100)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0000001)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1000001)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0010001)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1010001)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0000101)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1000101)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x0010101)<<32 | v) << plane, \
+ AV_LE2NE64C(UINT64_C(0x1010101)<<32 | v) << plane
- if (avctx->extradata_size < count * 3) {
- av_log(avctx, AV_LOG_ERROR, "palette data underflow\n");
- return AVERROR_INVALIDDATA;
- }
- for (i=0; i < count; i++) {
- pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
+ // If extradata is smaller than actually needed, fill the remaining with black.
+ count = FFMIN(avctx->extradata_size / 3, count);
+ if (count) {
+ for (i=0; i < count; i++) {
+ pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
+ }
+ } else { // Create gray-scale color palette for bps < 8
+ count = 1 << avctx->bits_per_coded_sample;
+
+ for (i=0; i < count; i++) {
+ pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample);
+ }
static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane)
{
const uint64_t *lut = plane8_lut[plane];
static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane)
{
const uint64_t *lut = plane8_lut[plane];
+/**
+ * Decode one complete byterun1 encoded line.
+ *
+ * @param dst the destination buffer where to store decompressed bitstream
+ * @param dst_size the destination plane size in bytes
+ * @param buf the source byterun1 compressed bitstream
+ * @param buf_end the EOF of source byterun1 compressed bitstream
+ * @return number of consumed bytes in byterun1 compressed bitstream
+*/
+static int decode_byterun(uint8_t *dst, int dst_size,
+ const uint8_t *buf, const uint8_t *const buf_end) {
+ const uint8_t *const buf_start = buf;
+ unsigned x;
+ for (x = 0; x < dst_size && buf < buf_end;) {
+ unsigned length;
+ const int8_t value = *buf++;
+ if (value >= 0) {
+ length = value + 1;
+ memcpy(dst + x, buf, FFMIN3(length, dst_size - x, buf_end - buf));
+ buf += length;
+ } else if (value > -128) {
+ length = -value + 1;
+ memset(dst + x, *buf++, FFMIN(length, dst_size - x));
+ } else { // noop
+ continue;
+ }
+ x += length;
+ }
+ return buf - buf_start;
+}
+
static int decode_frame_ilbm(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
static int decode_frame_ilbm(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
- if (avctx->reget_buffer(avctx, &s->frame) < 0){
+ if (s->init) {
+ if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+ return res;
+ }
+ } else if ((res = avctx->get_buffer(avctx, &s->frame)) < 0) {
- if (avctx->pix_fmt == PIX_FMT_PAL8) {
- for(y = 0; y < avctx->height; y++ ) {
- uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
- memset(row, 0, avctx->width);
- for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
- decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
- buf += s->planesize;
+ if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved
+ if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) {
+ for(y = 0; y < avctx->height; y++ ) {
+ uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
+ memset(row, 0, avctx->width);
+ for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+ decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+ buf += s->planesize;
+ }
+ }
+ } else { // PIX_FMT_BGR32
+ for(y = 0; y < avctx->height; y++ ) {
+ uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+ memset(row, 0, avctx->width << 2);
+ for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+ decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+ buf += s->planesize;
+ }
- uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
- memset(row, 0, avctx->width << 2);
- for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
- decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
- buf += s->planesize;
- }
+ uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
+ memcpy(row, buf, FFMIN(avctx->width, buf_end - buf));
+ buf += avctx->width + (avctx->width % 2); // padding if odd
- if (avctx->reget_buffer(avctx, &s->frame) < 0){
+ if (s->init) {
+ if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+ return res;
+ }
+ } else if ((res = avctx->get_buffer(avctx, &s->frame)) < 0) {
for(y = 0; y < avctx->height ; y++ ) {
uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
for(y = 0; y < avctx->height ; y++ ) {
uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
- for(x = 0; x < s->planesize && buf < buf_end; ) {
- int8_t value = *buf++;
- unsigned length;
- if (value >= 0) {
- length = value + 1;
- memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf));
- buf += length;
- } else if (value > -128) {
- length = -value + 1;
- memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x));
- } else { //noop
- continue;
- }
- x += length;
- }
+ buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
memset(row, 0, avctx->width << 2);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
memset(row, 0, avctx->width << 2);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
- for(x = 0; x < s->planesize && buf < buf_end; ) {
- int8_t value = *buf++;
- unsigned length;
- if (value >= 0) {
- length = value + 1;
- memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf));
- buf += length;
- } else if (value > -128) {
- length = -value + 1;
- memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x));
- } else { // noop
- continue;
- }
- x += length;
- }
+ buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
- for(x = 0; x < avctx->width && buf < buf_end; ) {
- int8_t value = *buf++;
- unsigned length;
- if (value >= 0) {
- length = value + 1;
- memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x));
- buf += length;
- } else if (value > -128) {
- length = -value + 1;
- memset(row + x, *buf++, FFMIN(length, avctx->width - x));
- } else { //noop
- continue;
- }
- x += length;
- }
+ buf += decode_byterun(row, avctx->width, buf, buf_end);
-AVCodec iff_ilbm_decoder = {
- "iff_ilbm",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_IFF_ILBM,
- sizeof(IffContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame_ilbm,
- CODEC_CAP_DR1,
+AVCodec ff_iff_ilbm_decoder = {
+ .name = "iff_ilbm",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_IFF_ILBM,
+ .priv_data_size = sizeof(IffContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame_ilbm,
+ .capabilities = CODEC_CAP_DR1,
-AVCodec iff_byterun1_decoder = {
- "iff_byterun1",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_IFF_BYTERUN1,
- sizeof(IffContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame_byterun1,
- CODEC_CAP_DR1,
+AVCodec ff_iff_byterun1_decoder = {
+ .name = "iff_byterun1",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_IFF_BYTERUN1,
+ .priv_data_size = sizeof(IffContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame_byterun1,
+ .capabilities = CODEC_CAP_DR1,