comparison imgconvert.c @ 1243:5d2376294fbf libavcodec

* fixing a bug in avpicture_layout (PAL8 wasn't handled properly) * adding regression tests for all pix_fmt conversions * making libavtest part of the default testsuite

1242:db903b6fd197

    int size = avpicture_get_size(pix_fmt, width, height);

    if (size > dest_size)
        return -1;

    if (pf->pixel_type == FF_PIXEL_PACKED) {
        if (pix_fmt == PIX_FMT_YUV422 || pix_fmt == PIX_FMT_RGB565 ||
	    pix_fmt == PIX_FMT_RGB555)
	  w = width * 2;
	else
	  w = width * (pf->depth * pf->nb_channels / 8);
	data_planes = 1;
	h = height;
    } else {
        data_planes = pf->nb_channels;
	w = width;

	     memcpy(dest, s, w);
	     dest += w;
	     s += src->linesize[i];
	 }
    }

    return size;
}

int avpicture_get_size(int pix_fmt, int width, int height)
{

1243:5d2376294fbf

    int size = avpicture_get_size(pix_fmt, width, height);

    if (size > dest_size)
        return -1;

    if (pf->pixel_type == FF_PIXEL_PACKED || pf->pixel_type == FF_PIXEL_PALETTE) {
        if (pix_fmt == PIX_FMT_YUV422 || pix_fmt == PIX_FMT_RGB565 ||
	    pix_fmt == PIX_FMT_RGB555)
	  w = width * 2;
	else if (pix_fmt == PIX_FMT_PAL8)
	  w = width;
	else
	  w = width * (pf->depth * pf->nb_channels / 8);
	  
	data_planes = 1;
	h = height;
    } else {
        data_planes = pf->nb_channels;
	w = width;

	     memcpy(dest, s, w);
	     dest += w;
	     s += src->linesize[i];
	 }
    }
    
    if (pf->pixel_type == FF_PIXEL_PALETTE)
	memcpy((unsigned char *)(((size_t)dest + 3) & ~3), src->data[1], 256 * 4);
    
    return size;
}

int avpicture_get_size(int pix_fmt, int width, int height)
{