comparison libvo/vo_gif89a.c @ 9540:ea4ca6a17d96

remove yuv2rgb and support frame duplication

9539:1df740eaa156

#include "video_out.h"
#include "video_out_internal.h"
#include "../postproc/rgb2rgb.h"

#define MPLAYER_VERSION 0.90
#define VO_GIF_REVISION 4

static vo_info_t info = {
	"animated GIF output",
	"gif89a",
	"Joey Parrish [e-mail]",

// the output width and height
static uint32_t img_width;
static uint32_t img_height;
// image data for slice rendering
static uint8_t *slice_data = NULL;
// pointer for whole frame rendering
static uint8_t *frame_data = NULL;
// reduced image data for flip_page
static uint8_t *reduce_data = NULL;
// reduced color map for flip_page
static ColorMapObject *reduce_cmap = NULL;

	// reconfigure need not be a fatal error, so return 0.
	// multiple configs without uninit will result in two
	// movies concatenated in one gif file.  the output
	// gif will have the dimensions of the first movie.
	
	switch (format) {
		case IMGFMT_RGB24: break;     
		case IMGFMT_YV12:
			yuv2rgb_init(24, MODE_BGR);
			slice_data = malloc(img_width * img_height * 3);
			if (slice_data == NULL) {
				printf("GIF89a: malloc failed.\n");
				return 1;
			}
			break;
		default:
			printf("GIF89a: Error - given unsupported colorspace.\n");
			return 1;     
	}

	// the EGifSetGifVersion line causes segfaults in certain
	// earlier versions of libungif.  i don't know exactly which,
	// but certainly in all those before v4.  if you have problems,
	// you need to upgrade your gif library.
#ifdef HAVE_GIF_4

	if (new_gif == NULL) {
		printf("GIF89a: error opening file \"%s\" for output.\n", gif_filename);
		return 1;
	}

	reduce_data = malloc(img_width * img_height);
	if (reduce_data == NULL) {
		printf("GIF89a: malloc failed.\n");
		return 1;
	}

static void flip_page(void)
{
	char CB[4]; // control block
	int delay = 0;
	int ret;
	uint8_t *img_data;

	cycle_pos++;
	if (cycle_pos < frame_cycle - frame_adj)
		return; // we are skipping this frame

	// slice_data is used for per slice rendering,
	// and frame_data is used for per frame rendering.
	// i seperated these two because slice_data is
	// ram i allocate, and frame_data is not.
	// using one pointer for both can lead to
	// either segfault (freeing ram that i'm not supposed
	// to) or memory leaks (not freeing any ram at all)
	if (slice_data != NULL) img_data = slice_data;
	else img_data = frame_data;
	
	// quantize the image
	ret = gif_reduce(img_width, img_height, img_data, reduce_data, reduce_cmap->Colors);
	if (ret == GIF_ERROR) {
		printf("GIF89a: Quantize failed.\n");
		return;
	}

	EGifPutLine(new_gif, reduce_data, img_width * img_height);
}

static uint32_t draw_frame(uint8_t *src[])
{
	frame_data = src[0];
	return 0;
}

static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y)
{
	uint8_t *dst;
	dst = slice_data + (img_width * y + x) * 3;
	yuv2rgb(dst, src[0], src[1], src[2], w, h, img_width * 3, stride[0], stride[1]);
	return 0;
}

static uint32_t query_format(uint32_t format)
{
	switch (format) {
		case IMGFMT_YV12:
			return VFCAP_CSP_SUPPORTED | VFCAP_TIMER | VFCAP_ACCEPT_STRIDE;
		case IMGFMT_RGB24:
			return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_TIMER;
	}
	return 0;
}

static uint32_t control(uint32_t request, void *data, ...)
{
	if (request == VOCTRL_QUERY_FORMAT) {
		return query_format(*((uint32_t*)data));
	}
	return VO_NOTIMPL;
}

static void uninit(void)

	if (reduce_cmap != NULL) FreeMapObject(reduce_cmap);
	
	// set the pointers back to null.
	new_gif = NULL;
	gif_filename = NULL;
	frame_data = NULL;
	slice_data = NULL;
	reduce_data = NULL;
	reduce_cmap = NULL;
}

9540:ea4ca6a17d96

#include "video_out.h"
#include "video_out_internal.h"
#include "../postproc/rgb2rgb.h"

#define MPLAYER_VERSION 0.90
#define VO_GIF_REVISION 6

static vo_info_t info = {
	"animated GIF output",
	"gif89a",
	"Joey Parrish [e-mail]",

// the output width and height
static uint32_t img_width;
static uint32_t img_height;
// image data for slice rendering
static uint8_t *slice_data = NULL;
// reduced image data for flip_page
static uint8_t *reduce_data = NULL;
// reduced color map for flip_page
static ColorMapObject *reduce_cmap = NULL;

	// reconfigure need not be a fatal error, so return 0.
	// multiple configs without uninit will result in two
	// movies concatenated in one gif file.  the output
	// gif will have the dimensions of the first movie.
	
	if (format != IMGFMT_RGB24) {
		printf("GIF89a: Error - given unsupported colorspace.\n");
		return 1;
	}
	
	// the EGifSetGifVersion line causes segfaults in certain
	// earlier versions of libungif.  i don't know exactly which,
	// but certainly in all those before v4.  if you have problems,
	// you need to upgrade your gif library.
#ifdef HAVE_GIF_4

	if (new_gif == NULL) {
		printf("GIF89a: error opening file \"%s\" for output.\n", gif_filename);
		return 1;
	}

	slice_data = malloc(img_width * img_height * 3);
	if (slice_data == NULL) {
		printf("GIF89a: malloc failed.\n");
		return 1;
	}

	reduce_data = malloc(img_width * img_height);
	if (reduce_data == NULL) {
		printf("GIF89a: malloc failed.\n");
		return 1;
	}

static void flip_page(void)
{
	char CB[4]; // control block
	int delay = 0;
	int ret;

	cycle_pos++;
	if (cycle_pos < frame_cycle - frame_adj)
		return; // we are skipping this frame

	// quantize the image
	ret = gif_reduce(img_width, img_height, slice_data, reduce_data, reduce_cmap->Colors);
	if (ret == GIF_ERROR) {
		printf("GIF89a: Quantize failed.\n");
		return;
	}

	EGifPutLine(new_gif, reduce_data, img_width * img_height);
}

static uint32_t draw_frame(uint8_t *src[])
{
	return 1;
}

static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y)
{
	uint8_t *dst, *frm;
	int i;
	dst = slice_data + (img_width * y + x) * 3;
	frm = src[0];
	for (i = 0; i < h; i++) {
		memcpy(dst, frm, w * 3);
		dst += (img_width * 3);
		frm += stride[0];
	}
	return 0;
}

static uint32_t query_format(uint32_t format)
{
	if (format == IMGFMT_RGB24)
		return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_TIMER | VFCAP_ACCEPT_STRIDE;
	return 0;
}

static uint32_t control(uint32_t request, void *data, ...)
{
	if (request == VOCTRL_QUERY_FORMAT) {
		return query_format(*((uint32_t*)data));
	}
	if (request == VOCTRL_DUPLICATE_FRAME) {
		flip_page();
		return VO_TRUE;
	}
	return VO_NOTIMPL;
}

static void uninit(void)

	if (reduce_cmap != NULL) FreeMapObject(reduce_cmap);
	
	// set the pointers back to null.
	new_gif = NULL;
	gif_filename = NULL;
	slice_data = NULL;
	reduce_data = NULL;
	reduce_cmap = NULL;
}