comparison xsubdec.c @ 5490:12d77ed34985 libavcodec

Deinterlace xsub subtitles

5489:dc54869af30b

    // process RLE-compressed data
    rlelen = FFMIN(rlelen, buf_end - buf);
    init_get_bits(&gb, buf, rlelen * 8);
    bitmap = sub->rects[0].bitmap;
    for (y = 0; y < h; y++) {
        for (x = 0; x < w; ) {
            int log2 = ff_log2_tab[show_bits(&gb, 8)];
            int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
            int colour = get_bits(&gb, 2);
            run = FFMIN(run, w - x);

            if (!run) run = w - x;
            memset(bitmap, colour, run);
            bitmap += run;
            x += run;
        }
        align_get_bits(&gb);
    }
    *data_size = 1;
    return buf_size;
}

5490:12d77ed34985

    // process RLE-compressed data
    rlelen = FFMIN(rlelen, buf_end - buf);
    init_get_bits(&gb, buf, rlelen * 8);
    bitmap = sub->rects[0].bitmap;
    for (y = 0; y < h; y++) {
        // interlaced: do odd lines
        if (y == h / 2) bitmap = sub->rects[0].bitmap + w;
        for (x = 0; x < w; ) {
            int log2 = ff_log2_tab[show_bits(&gb, 8)];
            int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
            int colour = get_bits(&gb, 2);
            run = FFMIN(run, w - x);

            if (!run) run = w - x;
            memset(bitmap, colour, run);
            bitmap += run;
            x += run;
        }
        // interlaced, skip every second line
        bitmap += w;
        align_get_bits(&gb);
    }
    *data_size = 1;
    return buf_size;
}