typedef struct {
AVFrame frame;
- unsigned planesize;
+ int planesize;
uint8_t * planebuf;
} IffContext;
+#define LUT8_PART(plane, v) \
+ 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
+
+#define LUT8(plane) { \
+ LUT8_PART(plane, 0x0000000), \
+ LUT8_PART(plane, 0x1000000), \
+ LUT8_PART(plane, 0x0010000), \
+ LUT8_PART(plane, 0x1010000), \
+ LUT8_PART(plane, 0x0000100), \
+ LUT8_PART(plane, 0x1000100), \
+ LUT8_PART(plane, 0x0010100), \
+ LUT8_PART(plane, 0x1010100), \
+ LUT8_PART(plane, 0x0000001), \
+ LUT8_PART(plane, 0x1000001), \
+ LUT8_PART(plane, 0x0010001), \
+ LUT8_PART(plane, 0x1010001), \
+ LUT8_PART(plane, 0x0000101), \
+ LUT8_PART(plane, 0x1000101), \
+ LUT8_PART(plane, 0x0010101), \
+ LUT8_PART(plane, 0x1010101), \
+}
+
+// 8 planes * 8-bit mask
+static const uint64_t plane8_lut[8][256] = {
+ LUT8(0), LUT8(1), LUT8(2), LUT8(3),
+ LUT8(4), LUT8(5), LUT8(6), LUT8(7),
+};
+
/**
* Convert CMAP buffer (stored in extradata) to lavc palette format
*/
int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{
- unsigned count, i;
+ int count, i;
if (avctx->bits_per_coded_sample > 8) {
av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n");
return AVERROR_INVALIDDATA;
}
- s->planesize = avctx->width >> 3;
+ s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary
s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE);
if (!s->planebuf)
return AVERROR(ENOMEM);
* @param bps bits_per_coded_sample (must be <= 8)
* @param plane plane number to decode as
*/
-static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane)
+static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int bps, int plane)
{
- GetBitContext gb;
- unsigned int i;
- const unsigned b = (buf_size * 8) + bps - 1;
- init_get_bits(&gb, buf, buf_size * 8);
- for(i = 0; i < b; i++) {
- dst[i] |= get_bits1(&gb) << plane;
+ const uint64_t *lut = plane8_lut[plane];
+ while (buf_size--) {
+ uint64_t v = AV_RN64A(dst) | lut[*buf++];
+ AV_WN64A(dst, v);
+ dst += 8;
}
}
static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane)
{
GetBitContext gb;
- unsigned i;
- const unsigned b = (buf_size * 8) + bps - 1;
+ int i;
+ const int b = buf_size * 8;
init_get_bits(&gb, buf, buf_size * 8);
for(i = 0; i < b; i++) {
dst[i] |= get_bits1(&gb) << plane;
{
IffContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data;
- unsigned buf_size = avpkt->size;
+ int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size;
- unsigned y, plane;
+ int y, plane;
if (avctx->reget_buffer(avctx, &s->frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
}
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++) {
+ 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), avctx->bits_per_coded_sample, plane);
buf += s->planesize;
}
}
- } else { // PIX_FMT_BGR32
+ } 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), avctx->bits_per_coded_sample, plane);
- buf += s->planesize;
+ buf += s->planesize;
}
}
}
{
IffContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data;
- unsigned buf_size = avpkt->size;
+ int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size;
- unsigned y, plane, x;
+ int y, plane, x;
if (avctx->reget_buffer(avctx, &s->frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved
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; 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;
+ 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;
}
- x += length;
- }
decodeplane8(row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane);
}
}
- } else { //PIX_FMT_BGR32
+ } 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);
}
}
}
- } else {
- for(y = 0; y < avctx->height ; y++ ) {
- uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+ } else {
+ for(y = 0; y < avctx->height ; y++ ) {
+ uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
for(x = 0; x < avctx->width && buf < buf_end; ) {
int8_t value = *buf++;
unsigned length;
projects / libav.git / blobdiff