comparison gui/util/bitmap.c @ 33112:654dfdf176ac

Revise debug messages. All messages start with [bitmap] and are level MSGL_DBG2 now. The texts have been revised, some messages were added or removed.

33111:7b7d03089255

    AVPacket pkt;

    fp = fopen(fname, "rb");

    if (!fp) {
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[png] file read error ( %s )\n", fname);
        return 1;
    }

    fseek(fp, 0, SEEK_END);
    len = ftell(fp);

    if (len > 50 * 1024 * 1024) {
        fclose(fp);
        return 2;
    }

    data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);

    avcodec_close(avctx);
    av_freep(&frame);
    av_freep(&avctx);
    av_freep(&data);

    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[png] filename: %s.\n", fname);
    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[png]  size: %lux%lu bits: %u\n", bf->Width, bf->Height, bf->BPP);
    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[png]  imagesize: %lu\n", bf->ImageSize);

    return !(decode_ok && bf->BPP);
}

static int conv24to32(txSample *bf)

        bf->ImageSize = bf->Width * bf->Height * 4;
        bf->Image     = calloc(1, bf->ImageSize);

        if (!bf->Image) {
            free(tmpImage);
            mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory for image\n");
            return 1;
        }

        for (c = 0, i = 0; c < bf->ImageSize; c += 4, i += 3)
            *(uint32_t *)&bf->Image[c] = AV_RB24(&tmpImage[i]);

        free(tmpImage);

    if (fname == NULL)
        return -2;

    if (pngRead(fname, bf)) {
        mp_dbg(MSGT_GPLAYER, MSGL_FATAL, "[bitmap] unknown file type ( %s )\n", fname);
        return -5;
    }

    if (bf->BPP < 24) {
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] Sorry, only 24 and 32 bpp bitmaps are supported.\n");
        return -1;
    }

    if (conv24to32(bf))
        return -8;

{
    out->Width     = in->Width;
    out->Height    = in->Height;
    out->BPP       = 1;
    out->ImageSize = (out->Width * out->Height + 7) / 8;

    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[c32to1] imagesize: %lu\n", out->ImageSize);

    out->Image = calloc(1, out->ImageSize);

    if (out->Image == NULL)
        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_NotEnoughMemoryC32To1);

                out->Image[c++] = tmp;
                tmp = b = 0;
            }
        }

        if (b)
            out->Image[c] = tmp;

        if (nothaveshape) {
            free(out->Image);

33112:654dfdf176ac

    AVPacket pkt;

    fp = fopen(fname, "rb");

    if (!fp) {
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] open error: %s\n", fname);
        return 1;
    }

    fseek(fp, 0, SEEK_END);
    len = ftell(fp);

    if (len > 50 * 1024 * 1024) {
        fclose(fp);
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file too big: %s\n", fname);
        return 2;
    }

    data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);

    avcodec_close(avctx);
    av_freep(&frame);
    av_freep(&avctx);
    av_freep(&data);

    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file: %s\n", fname);
    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap]  size: %lux%lu, color depth: %u\n", bf->Width, bf->Height, bf->BPP);
    mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap]  image size: %lu\n", bf->ImageSize);

    return !(decode_ok && bf->BPP);
}

static int conv24to32(txSample *bf)

        bf->ImageSize = bf->Width * bf->Height * 4;
        bf->Image     = calloc(1, bf->ImageSize);

        if (!bf->Image) {
            free(tmpImage);
            mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", bf->ImageSize);
            return 1;
        }

        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %lu\n", bf->ImageSize);

        for (c = 0, i = 0; c < bf->ImageSize; c += 4, i += 3)
            *(uint32_t *)&bf->Image[c] = AV_RB24(&tmpImage[i]);

        free(tmpImage);

    if (fname == NULL)
        return -2;

    if (pngRead(fname, bf)) {
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] read error: %s\n", fname);
        return -5;
    }

    if (bf->BPP < 24) {
        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] bpp too low: %u\n", bf->BPP);
        return -1;
    }

    if (conv24to32(bf))
        return -8;

{
    out->Width     = in->Width;
    out->Height    = in->Height;
    out->BPP       = 1;
    out->ImageSize = (out->Width * out->Height + 7) / 8;

    out->Image = calloc(1, out->ImageSize);

    if (out->Image == NULL)
        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_NotEnoughMemoryC32To1);

                out->Image[c++] = tmp;
                tmp = b = 0;
            }
        }

        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 1 bpp conversion size: %lu\n", out->ImageSize);

        if (b)
            out->Image[c] = tmp;

        if (nothaveshape) {
            free(out->Image);