[Mplayer-cvslog] CVS: main/libvo vo_tga.c,NONE,1.1 video_out.c,1.71,1.72
Arpi of Ize
arpi at mplayerhq.hu
Sun Aug 24 20:26:48 CEST 2003
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv29221/libvo
Modified Files:
video_out.c
Added Files:
vo_tga.c
Log Message:
TGA image output VO module
patch by Daniele Forghieri ( guru at digitalfantasy.it )
--- NEW FILE ---
/*
* vo_tga.c: targa output
*
* this video output module write targa uncompressed file in 15, 24 and 32 bit bgr format.
*
* to select the output format use the format filter:
* mplayer -vo tga -vf format=bgr15 ...
* mplayer -vo tga -vf format=bgr24 ...
* mplayer -vo tga -vf format=bgr32 ...
*
* The 16 bit file are loaded without problem from Gimp and ImageMagick but give an error
* with entice (a visualizer from the enlightenment package that use the imlib2 package).
*
* In 32 bit mode the alpha channel is set to 255 (0xff). I may not work with big endian
* machine (is probably enought to change the TGA_ALPHA32 from 0xff000000 to 0x000000ff).
*
* I need to fill the alpha channel because entice consider that alpha channel (and displays
* nothing, only the background!), but ImageMacick (the program display) or gimp doesn't
* care.
*
* maybe is possible (with a compilation switch) to avoid the fill of the alpha channel
* and work outside mplayer (if needed)
*
* Daniele Forghieri ( guru at digitalfantasy.it )
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <math.h>
#include "config.h"
#include "video_out.h"
#include "video_out_internal.h"
/* This must be changed for Motorola type processor ? */
#define TGA_ALPHA32 0xff000000
static vo_info_t info =
{
"Targa output",
"tga",
"Daniele Forghieri - guru at digitalfantasy.it",
""
};
LIBVO_EXTERN (tga)
/* locals vars */
static int frame_num = 0;
static void *line_buff;
static void tga_make_header(uint8_t *h, int dx, int dy, int bpp)
{
int i;
for(i = 0; i < 18; i++) {
switch (i) {
case 2:
*h = 0x02;
break;
case 12:
*h = dx & 0xff;
break;
case 13:
*h = (dx >> 8) & 0xff;
break;
case 14:
*h = dy & 0xff;
break;
case 15:
*h = (dy >> 8) & 0xff;
break;
case 16:
*h = bpp;
break;
case 17:
*h = 0x20;
break;
default:
*h = 0;
}
++h;
}
}
static int write_tga( char *file, int bpp, int dx, int dy, uint8_t *buf, int stride)
{
int er;
FILE *fo;
fo = fopen(file, "wb");
if (fo != NULL) {
uint8_t hdr[18];
er = 0;
tga_make_header(hdr, dx, dy, bpp);
if (fwrite(hdr, sizeof(hdr), 1, fo) == 1) {
int wb;
wb = ((bpp + 7) / 8) * dx;
if (bpp == 32) {
/* Setup the alpha channel for every pixel */
while (dy-- > 0) {
uint32_t *d;
uint32_t *s;
int x;
s = (uint32_t *)buf;
d = line_buff;
for(x = 0; x < dx; x++) {
*d++ = *s++ | TGA_ALPHA32;
}
if (fwrite(line_buff, wb, 1, fo) != 1) {
er = 4;
break;
}
buf += stride;
}
}
else {
while (dy-- > 0) {
if (fwrite(buf, wb, 1, fo) != 1) {
er = 4;
break;
}
buf += stride;
}
}
}
else {
er = 2;
}
fclose(fo);
}
else {
er = 1;
}
if (er) {
fprintf(stderr, "Error writing file [%s]\n", file);
}
return(er);
}
static uint32_t draw_image(mp_image_t* mpi)
{
char file[20 + 1];
snprintf (file, 20, "%08d.tga", ++frame_num);
write_tga( file,
mpi->bpp,
mpi->w,
mpi->h,
mpi->planes[0],
mpi->stride[0]);
return VO_TRUE;
}
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
/* buffer for alpha */
if(line_buff){ free(line_buff); line_buff=NULL; }
if (format == (IMGFMT_BGR | 32)) {
line_buff = malloc(width * 4);
}
return 0;
}
static void draw_osd(void)
{
}
static void flip_page (void)
{
return;
}
static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w,int h,int x,int y)
{
return -1;
}
static uint32_t draw_frame(uint8_t * src[])
{
return -1;
}
static uint32_t query_format(uint32_t format)
{
switch(format){
case IMGFMT_BGR|15:
case IMGFMT_BGR|24:
case IMGFMT_BGR|32:
return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
}
return 0;
}
static void uninit(void)
{
if(line_buff){ free(line_buff); line_buff=NULL; }
}
static void check_events(void)
{
}
static uint32_t preinit(const char *arg)
{
if(arg) {
printf("vo_tga: Unknown subdevice: %s\n",arg);
return ENOSYS;
}
return 0;
}
static uint32_t control(uint32_t request, void *data, ...)
{
switch (request) {
case VOCTRL_DRAW_IMAGE:
return draw_image(data);
case VOCTRL_QUERY_FORMAT:
return query_format(*((uint32_t*)data));
}
return VO_NOTIMPL;
}
Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- video_out.c 21 Jun 2003 01:47:26 -0000 1.71
+++ video_out.c 24 Aug 2003 18:26:37 -0000 1.72
@@ -104,6 +104,9 @@
#ifdef HAVE_TDFX_VID
extern vo_functions_t video_out_tdfx_vid;
#endif
+#ifdef HAVE_TGA
+extern vo_functions_t video_out_tga;
+#endif
vo_functions_t* video_out_drivers[] =
{
@@ -200,6 +203,9 @@
#endif
#if defined(CONFIG_VIDIX) && defined(HAVE_X11)
&video_out_xvidix,
+#endif
+#ifdef HAVE_TGA
+ &video_out_tga,
#endif
NULL
};
More information about the MPlayer-cvslog
mailing list