comparison iff.c @ 11719:30356abc8604 libavcodec

Move handling of paletted data to the IFF demuxer. This allows future handling of things such as masking/EHB/HAM for this type of data. Patch by Sebastian Vater <cdgs basty googlemail com>.

11718:f2beca0bbf98

    if (avctx->reget_buffer(avctx, &s->frame) < 0){
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
        return -1;
    }

    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++) {

            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;
            }
        }
    }

    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = s->frame;

11719:30356abc8604

    if (avctx->reget_buffer(avctx, &s->frame) < 0){
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
        return -1;
    }

    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 && buf < buf_end; plane++) {

            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;
            }
        }
    }
    } else if (avctx->pix_fmt == PIX_FMT_PAL8) { // IFF-PBM
        for(y = 0; y < avctx->height; y++ ) {
            uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
            memcpy(row, buf, FFMIN(avctx->width, buf_end - buf));
            buf += avctx->width;
        }
    }

    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = s->frame;