comparison a64multienc.c @ 12429:305987348a98 libavcodec

Clarify code/avoid possible bugs by using precalculated values that are used for extradata as well

12428:06453ad84991

            /* create colorram map and a c64 readable charset */
            render_charset(avctx, charset, colram);

            /* copy charset to buf */
            memcpy(buf,charset,0x800*(INTERLACED+1));

            /* advance pointers */
            buf      += 0x800*(INTERLACED+1);
            charset  += 0x800*(INTERLACED+1);
            req_size += 0x800*(INTERLACED+1);
        }
        /* no charset so clean buf */
        else memset(buf,0,0x800*(INTERLACED+1));

        /* write x frames to buf */
        for (frame = 0; frame < c->mc_lifetime; frame++) {
            /* copy charmap to buf. buf is uchar*, charmap is int*, so no memcpy here, sorry */
            for (a = 0; a < 1000; a++) {
                buf[a] = charmap[a];
            }
            /* advance pointers */
            buf += 0x400;
            req_size += 0x400;

            /* compress and copy colram to buf */
            if(c->mc_use_5col) {
                a64_compress_colram(buf,charmap,colram);
                /* advance pointers */
                buf += 0x100;
                req_size += 0x100;
            }

            /* advance to next charmap */
            charmap += 1000;
        }

12429:305987348a98

            /* create colorram map and a c64 readable charset */
            render_charset(avctx, charset, colram);

            /* copy charset to buf */
            memcpy(buf,charset, charset_size);

            /* advance pointers */
            buf      += charset_size;
            charset  += charset_size;
            req_size += charset_size;
        }
        /* no charset so clean buf */
        else memset(buf, 0, charset_size);

        /* write x frames to buf */
        for (frame = 0; frame < c->mc_lifetime; frame++) {
            /* copy charmap to buf. buf is uchar*, charmap is int*, so no memcpy here, sorry */
            for (a = 0; a < 1000; a++) {
                buf[a] = charmap[a];
            }
            /* advance pointers */
            buf += screen_size;
            req_size += screen_size;

            /* compress and copy colram to buf */
            if(c->mc_use_5col) {
                a64_compress_colram(buf,charmap,colram);
                /* advance pointers */
                buf += colram_size;
                req_size += colram_size;
            }

            /* advance to next charmap */
            charmap += 1000;
        }