comparison bink.c @ 11245:1e9ff636c3db libavcodec

Make Bink decoder to stop decoding planes after all bits are used. This prevents crashes during decoding grayscale Bink files like samples from Impossible Creatures game demo.

11244:eb773ca000d9

    const uint8_t *scan;
    int xoff, yoff;
    DECLARE_ALIGNED_16(DCTELEM, block[64]);
    DECLARE_ALIGNED_16(uint8_t, ublock[64]);
    int coordmap[64];

    if(c->pic.data[0])
        avctx->release_buffer(avctx, &c->pic);

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

    init_get_bits(&gb, pkt->data, pkt->size*8);
    if (c->version >= 'i')
        skip_bits_long(&gb, 32);

    for (plane = 0; plane < 3; plane++) {
        const int stride = c->pic.linesize[plane];

                }
            }
        }
        if (get_bits_count(&gb) & 0x1F) //next plane data starts at 32-bit boundary
            skip_bits_long(&gb, 32 - (get_bits_count(&gb) & 0x1F));
    }
    emms_c();

    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = c->pic;

11245:1e9ff636c3db

    const uint8_t *scan;
    int xoff, yoff;
    DECLARE_ALIGNED_16(DCTELEM, block[64]);
    DECLARE_ALIGNED_16(uint8_t, ublock[64]);
    int coordmap[64];
    int bits_count = pkt->size << 3;

    if(c->pic.data[0])
        avctx->release_buffer(avctx, &c->pic);

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

    init_get_bits(&gb, pkt->data, bits_count);
    if (c->version >= 'i')
        skip_bits_long(&gb, 32);

    for (plane = 0; plane < 3; plane++) {
        const int stride = c->pic.linesize[plane];

                }
            }
        }
        if (get_bits_count(&gb) & 0x1F) //next plane data starts at 32-bit boundary
            skip_bits_long(&gb, 32 - (get_bits_count(&gb) & 0x1F));
        if (get_bits_count(&gb) >= bits_count)
            break;
    }
    emms_c();

    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = c->pic;