comparison libvo/spuenc.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.

29262:7d545a6b8aff

 * encode a pixmap with RLE
 *
 * Copyright (C) 2000   Alejandro J. Cura <[e-mail]>
 *
 * (modified a bit to work with the dxr3 driver...4/2/2002 cg)
 * 
 * Based on the hard work of:
 *
 *   Samuel Hocevar <[e-mail]> and Michel Lespinasse <[e-mail]>
 *
 * This file is part of MPlayer.

	bottom= top + pb->y - 1;
	right= left + pb->x - 1;

/* the format of this is well described by a page:
 * http://members.aol.com/mpucoder/DVD/spu.html
 * 
 * note I changed the layout of commands to turn off the subpic as the 
 * first command, and then turn on the new subpic...this is so we can 
 * leave the subpic on for an arbitrary ammount of time as controlled by 
 * mplayer (ie when we turn on the subpic we don't know how long it should
 * stay on when using mplayer).
 * with this layout we turn off the last subpic as we are turning on the 
 * new one.
 * The original hd it turn on the subpic, and delay the turn off command using
 * the durration/delay feature.
 * */
	/* start at x0+2*/
	i= controlstart;
	/* display duration... */
//	ed->data[i++]= 0x00;
//	ed->data[i++]= 0x00; //durration before turn off command occurs
			     //in 90000/1024 units
	
	/* x1 */
//	x1=i+4;
//	ed->data[i++]= x1 >> 8;//location of next command block
//	ed->data[i++]= x1 & 0xff;
	/* finish it */
//	ed->data[i++]= 0x02;//turn off command
//	ed->data[i++]= 0xff;//end of command block
	x1= i; //marker for last command block address 
	
	/* display duration... */
	ed->data[i++]= 0x00;
	ed->data[i++]= 0x00; //durration before turn on command occurs
			     //in 90000/1024 units
	/* x1 */

	/* 0x03: palette info */
	ed->data[i++]= 0x03;
	ed->data[i++]= 0x08;
	ed->data[i++]= 0x7f;
/*
 * The palette is a coded index (one of 16) 0 is black, 0xf is white 
 * (unless you screw with the default palette)
 * for what I am doing I only use white. 
 * 7 is lt grey, and 8 is dk grey...
 * */
	/* 0x04: transparency info (reversed) */
	ed->data[i++]= 0x04;
	ed->data[i++]= 0xFF;//change the opacity values of the color entries

	}

	/* x0 */
	ed->data[2]= (controlstart) >> 8;
	ed->data[3]= (controlstart) & 0xff;
	
	/* packet size */
	ed->data[0]= i >> 8;
	ed->data[1]= i & 0xff;
	
	ed->count= i;
}

static void
encode_put_nibble( encodedata* ed, unsigned char nibble ) {

encode_do_row( encodedata* ed, pixbuf* pb, int row ) {
	int i= 0;
	unsigned char* pix= pb->pixels + row * pb->x;
	int color= *pix;
	int n= 0; /* the number of pixels of this color */
	
	while( i++ < pb->x ) {
		/* FIXME: watch this space for EOL */
		if( *pix != color || n == 255 ) {
			encode_pixels( ed, color, n );
			color= *pix;

}


void
pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) {
	int colors, chrs, l, n; 
	char c[4], table[256];
	unsigned char *b, *i;

	sscanf( xpm[0], "%d %d %d %d", &pb->x, &pb->y, &colors, &chrs);
	if( colors > 4 ) {

	}
	if( pb->x > 0xFFF || pb->y > 0xFFF ) {
		fprintf( stderr, "the size is excesive\n");
		exit (-1);
	}
	
	for( l=0; l<colors; l++ ) {
		n= sscanf( xpm[l+1], "%c c #%x", &c[l], &pb->rgb[l]);
		if( n < 2 ) {
			/* this one is transparent */
			pb->rgb[l]=0xff000000;

		table[(int)c[l]]=l;
	}

	pb->pixels= malloc( pb->x * pb->y );
	b= pb->pixels;
	
	for( l= colors+1; l <= pb->y + colors; l++ ) {
		i= xpm[l];
		while( (int)*i) {
			*b++ = table[*i++];
		}

29263:0f1b5b68af32

 * encode a pixmap with RLE
 *
 * Copyright (C) 2000   Alejandro J. Cura <[e-mail]>
 *
 * (modified a bit to work with the dxr3 driver...4/2/2002 cg)
 *
 * Based on the hard work of:
 *
 *   Samuel Hocevar <[e-mail]> and Michel Lespinasse <[e-mail]>
 *
 * This file is part of MPlayer.

	bottom= top + pb->y - 1;
	right= left + pb->x - 1;

/* the format of this is well described by a page:
 * http://members.aol.com/mpucoder/DVD/spu.html
 *
 * note I changed the layout of commands to turn off the subpic as the
 * first command, and then turn on the new subpic...this is so we can
 * leave the subpic on for an arbitrary ammount of time as controlled by
 * mplayer (ie when we turn on the subpic we don't know how long it should
 * stay on when using mplayer).
 * with this layout we turn off the last subpic as we are turning on the
 * new one.
 * The original hd it turn on the subpic, and delay the turn off command using
 * the durration/delay feature.
 * */
	/* start at x0+2*/
	i= controlstart;
	/* display duration... */
//	ed->data[i++]= 0x00;
//	ed->data[i++]= 0x00; //durration before turn off command occurs
			     //in 90000/1024 units

	/* x1 */
//	x1=i+4;
//	ed->data[i++]= x1 >> 8;//location of next command block
//	ed->data[i++]= x1 & 0xff;
	/* finish it */
//	ed->data[i++]= 0x02;//turn off command
//	ed->data[i++]= 0xff;//end of command block
	x1= i; //marker for last command block address

	/* display duration... */
	ed->data[i++]= 0x00;
	ed->data[i++]= 0x00; //durration before turn on command occurs
			     //in 90000/1024 units
	/* x1 */

	/* 0x03: palette info */
	ed->data[i++]= 0x03;
	ed->data[i++]= 0x08;
	ed->data[i++]= 0x7f;
/*
 * The palette is a coded index (one of 16) 0 is black, 0xf is white
 * (unless you screw with the default palette)
 * for what I am doing I only use white.
 * 7 is lt grey, and 8 is dk grey...
 * */
	/* 0x04: transparency info (reversed) */
	ed->data[i++]= 0x04;
	ed->data[i++]= 0xFF;//change the opacity values of the color entries

	}

	/* x0 */
	ed->data[2]= (controlstart) >> 8;
	ed->data[3]= (controlstart) & 0xff;

	/* packet size */
	ed->data[0]= i >> 8;
	ed->data[1]= i & 0xff;

	ed->count= i;
}

static void
encode_put_nibble( encodedata* ed, unsigned char nibble ) {

encode_do_row( encodedata* ed, pixbuf* pb, int row ) {
	int i= 0;
	unsigned char* pix= pb->pixels + row * pb->x;
	int color= *pix;
	int n= 0; /* the number of pixels of this color */

	while( i++ < pb->x ) {
		/* FIXME: watch this space for EOL */
		if( *pix != color || n == 255 ) {
			encode_pixels( ed, color, n );
			color= *pix;

}


void
pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) {
	int colors, chrs, l, n;
	char c[4], table[256];
	unsigned char *b, *i;

	sscanf( xpm[0], "%d %d %d %d", &pb->x, &pb->y, &colors, &chrs);
	if( colors > 4 ) {

	}
	if( pb->x > 0xFFF || pb->y > 0xFFF ) {
		fprintf( stderr, "the size is excesive\n");
		exit (-1);
	}

	for( l=0; l<colors; l++ ) {
		n= sscanf( xpm[l+1], "%c c #%x", &c[l], &pb->rgb[l]);
		if( n < 2 ) {
			/* this one is transparent */
			pb->rgb[l]=0xff000000;

		table[(int)c[l]]=l;
	}

	pb->pixels= malloc( pb->x * pb->y );
	b= pb->pixels;

	for( l= colors+1; l <= pb->y + colors; l++ ) {
		i= xpm[l];
		while( (int)*i) {
			*b++ = table[*i++];
		}