April 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/DOCS/tech vop.txt,1.3,1.4
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv15635 Modified Files: vop.txt Log Message: updated Index: vop.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/vop.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vop.txt 19 Apr 2002 02:20:29 -0000 1.3 +++ vop.txt 29 Apr 2002 20:26:45 -0000 1.4 @@ -41,14 +41,19 @@ mencoder uses (autoload) it to render SUB/OSD -vop flip - Flips image upside-down. + Flips image upside-down (vertical mirroring) No parameters. MPI: DR (if possible) or EXPORT, using stride manipulation Special: dec_video autoloads it when flipping is required and libvo can't do --vop rotate[=mirror] +-vop mirror + Horizontal mirroring + No parameters. + MPI: TEMP + +-vop rotate[=x] Rotate image +/- 90 degrees - Optional mirror parameter (0..3) controls horizontal and vertical mirroring + Optional 'x' parameter (0..3) controls horizontal and vertical mirroring MPI: TEMP -vop scale[=w:h] @@ -68,6 +73,10 @@ RGB 24/32 <-> BGR 24/32 colorspace conversion (default) or RGB 24/32 <-> RGB 24/32 conversion with R<->B swapping ('swap' option) MPI: TEMP, accepts stride + +-vop palette + RGB/BGR 8 -> RGB/BGR 15/16/24/32 colorspace conversion using palette + MPI: TEMP, accepts stride -vop format[=fourcc] _restrict_ the list of supported colorspaces (query-format()) to a single, @@ -85,7 +94,13 @@ MPI: DR (if possible) or TEMP Special: dec_video autoloads it if -pp option used but codec can't do pp. +-vop lavc + Fast software YV12->MPEG1 conversion, usefull for dxr3/dvb drivers + It uses libavcodec. Currently faster and better quality than -vop fame! + MPI: EXPORT special + -vop fame Fast software YV12->MPEG1 conversion, usefull for dxr3/dvb drivers + It uses libfame. MPI: EXPORT special

1 0

CVS: main mencoder.c,1.125,1.126 cfg-common.h,1.40,1.41 cfg-mplayer.h,1.146,1.147
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv10980 Modified Files: mencoder.c cfg-common.h cfg-mplayer.h Log Message: -xy,-zoom,-flip available in mencoder too Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- mencoder.c 28 Apr 2002 17:48:45 -0000 1.125 +++ mencoder.c 29 Apr 2002 20:07:53 -0000 1.126 @@ -90,6 +90,13 @@ int audio_family=-1; // override audio codec family int video_family=-1; // override video codec family +// libvo opts: (defiend at libmpcodecs/vd.c) +extern int screen_size_xy; +extern float movie_aspect; +extern int softzoom; +extern int flip; + + #ifdef HAVE_MP3LAME int out_audio_codec=ACODEC_VBRMP3; #else Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- cfg-common.h 17 Apr 2002 21:51:17 -0000 1.40 +++ cfg-common.h 29 Apr 2002 20:07:53 -0000 1.41 @@ -101,6 +101,14 @@ {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, + {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, + {"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, + {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + // ------------------------- subtitles options -------------------- #ifdef USE_SUB Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- cfg-mplayer.h 17 Apr 2002 21:51:17 -0000 1.146 +++ cfg-mplayer.h 29 Apr 2002 20:07:53 -0000 1.147 @@ -234,20 +234,13 @@ #endif {"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"y", &opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, - {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"screenw", &vo_screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, - {"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, - {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, - {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL}, {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL},

1 0

CVS: main/libmpcodecs vd.c,1.35,1.36
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv10092 Modified Files: vd.c Log Message: apply aspect prescaling to -xy Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- vd.c 19 Apr 2002 23:21:44 -0000 1.35 +++ vd.c 29 Apr 2002 20:05:11 -0000 1.36 @@ -121,7 +121,6 @@ int screen_size_y=0;//SCREEN_SIZE_Y; // vo_functions_t* video_out=sh->video_out; vf_instance_t* vf=sh->vfilter; - unsigned int fmtlist[CODECS_MAX_OUTFMT+1]; #if 1 if(!(sh->disp_w && sh->disp_h)) @@ -192,37 +191,41 @@ if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect // if(!sh->aspect) sh->aspect=1.0; - screen_size_x = opt_screen_size_x; - screen_size_y = opt_screen_size_y; - if(screen_size_xy||screen_size_x||screen_size_y){ - if(screen_size_xy>0){ - if(screen_size_xy<=8){ - screen_size_x=screen_size_xy*sh->disp_w; - screen_size_y=screen_size_xy*sh->disp_h; - } else { - screen_size_x=screen_size_xy; - screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w; - } - } else if(!vidmode){ + + if(opt_screen_size_x||opt_screen_size_y){ + screen_size_x = opt_screen_size_x; + screen_size_y = opt_screen_size_y; + if(!vidmode){ if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; if(screen_size_x<=8) screen_size_x*=sh->disp_w; if(screen_size_y<=8) screen_size_y*=sh->disp_h; - } + } } else { // check source format aspect, calculate prescale ::atmos screen_size_x=sh->disp_w; screen_size_y=sh->disp_h; + if(screen_size_xy>0){ + if(screen_size_xy<=8){ + // -xy means x+y scale + screen_size_x*=screen_size_xy; + screen_size_y*=screen_size_xy; + } else { + // -xy means forced width while keeping correct aspect + screen_size_x=screen_size_xy; + screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w; + } + } if(sh->aspect>0.01){ + int w; mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n", sh->aspect); - screen_size_x=(int)((float)sh->disp_h*sh->aspect); - screen_size_x+=screen_size_x%2; // round - if(screen_size_x<sh->disp_w){ - screen_size_x=sh->disp_w; - screen_size_y=(int)((float)sh->disp_w*(1.0/sh->aspect)); + w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round + // we don't like horizontal downscale || user forced width: + if(w<screen_size_x || screen_size_xy>8){ + screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect)); screen_size_y+=screen_size_y%2; // round - } + } else screen_size_x=w; // keep new width } else { mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is undefined - no prescaling applied.\n"); }

1 0

This.major
by randizona 29 Apr '02

29 Apr '02

1 0

CVS: main/libao2 ao_alsa5.c,1.10,1.11
by Alex Beregszaszi 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv499 Modified Files: ao_alsa5.c Log Message: play() fix by Jimen Ching <jching(a)flex.com>, additional printf->mp_msg conversions (for coming i18n support) Index: ao_alsa5.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_alsa5.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ao_alsa5.c 22 Apr 2002 22:33:06 -0000 1.10 +++ ao_alsa5.c 29 Apr 2002 16:53:38 -0000 1.11 @@ -15,6 +15,8 @@ #include "audio_out_internal.h" #include "afmt.h" +#include "../mp_msg.h" + extern int verbose; static ao_info_t info = @@ -50,18 +52,17 @@ snd_pcm_info_t info; snd_pcm_channel_info_t chninfo; - printf("alsa-init: requested format: %d Hz, %d channels, %s\n", rate_hz, + mp_msg(MSGT_AO, MSGL_INFO, "alsa-init: requested format: %d Hz, %d channels, %s\n", rate_hz, channels, audio_out_format_name(format)); alsa_handler = NULL; - if (verbose) - printf("alsa-init: compiled for ALSA-%s (%d)\n", SND_LIB_VERSION_STR, - SND_LIB_VERSION); + mp_msg(MSGT_AO, MSGL_V, "alsa-init: compiled for ALSA-%s (%d)\n", SND_LIB_VERSION_STR, + SND_LIB_VERSION); if ((cards = snd_cards()) < 0) { - printf("alsa-init: no soundcards found\n"); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: no soundcards found\n"); return(0); } @@ -111,7 +112,7 @@ ao_data.bps *= 2; break; case -1: - printf("alsa-init: invalid format (%s) requested - output disabled\n", + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: invalid format (%s) requested - output disabled\n", audio_out_format_name(format)); return(0); default: @@ -164,18 +165,18 @@ if ((err = snd_pcm_open(&alsa_handler, 0, 0, SND_PCM_OPEN_PLAYBACK)) < 0) { - printf("alsa-init: playback open error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: playback open error: %s\n", snd_strerror(err)); return(0); } if ((err = snd_pcm_info(alsa_handler, &info)) < 0) { - printf("alsa-init: pcm info error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: pcm info error: %s\n", snd_strerror(err)); return(0); } - printf("alsa-init: %d soundcard%s found, using: %s\n", cards, - (cards == 1) ? "" : "s", info.name); + mp_msg(MSGT_AO, MSGL_INFO, "alsa-init: %d soundcard(s) found, using: %s\n", + cards, info.name); if (info.flags & SND_PCM_INFO_PLAYBACK) { @@ -183,7 +184,7 @@ chninfo.channel = SND_PCM_CHANNEL_PLAYBACK; if ((err = snd_pcm_channel_info(alsa_handler, &chninfo)) < 0) { - printf("alsa-init: pcm channel info error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: pcm channel info error: %s\n", snd_strerror(err)); return(0); } @@ -192,9 +193,8 @@ ao_data.buffersize = chninfo.buffer_size; #endif - if (verbose) - printf("alsa-init: setting preferred buffer size from driver: %d bytes\n", - ao_data.buffersize); + mp_msg(MSGT_AO, MSGL_V, "alsa-init: setting preferred buffer size from driver: %d bytes\n", + ao_data.buffersize); } memset(&params, 0, sizeof(params)); @@ -208,7 +208,7 @@ if ((err = snd_pcm_channel_params(alsa_handler, &params)) < 0) { - printf("alsa-init: error setting parameters: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: error setting parameters: %s\n", snd_strerror(err)); return(0); } @@ -221,17 +221,17 @@ if ((err = snd_pcm_channel_setup(alsa_handler, &setup)) < 0) { - printf("alsa-init: error setting up channel: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: error setting up channel: %s\n", snd_strerror(err)); return(0); } if ((err = snd_pcm_channel_prepare(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-init: channel prepare error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-init: channel prepare error: %s\n", snd_strerror(err)); return(0); } - printf("AUDIO: %d Hz/%d channels/%d bps/%d bytes buffer/%s\n", + mp_msg(MSGT_AO, MSGL_INFO, "AUDIO: %d Hz/%d channels/%d bps/%d bytes buffer/%s\n", ao_data.samplerate, ao_data.channels+1, ao_data.bps, ao_data.buffersize, snd_pcm_get_format_name(alsa_format.format)); return(1); @@ -244,19 +244,19 @@ if ((err = snd_pcm_playback_drain(alsa_handler)) < 0) { - printf("alsa-uninit: playback drain error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-uninit: playback drain error: %s\n", snd_strerror(err)); return; } if ((err = snd_pcm_channel_flush(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-uninit: playback flush error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-uninit: playback flush error: %s\n", snd_strerror(err)); return; } if ((err = snd_pcm_close(alsa_handler)) < 0) { - printf("alsa-uninit: pcm close error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-uninit: pcm close error: %s\n", snd_strerror(err)); return; } } @@ -268,19 +268,19 @@ if ((err = snd_pcm_playback_drain(alsa_handler)) < 0) { - printf("alsa-reset: playback drain error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-reset: playback drain error: %s\n", snd_strerror(err)); return; } if ((err = snd_pcm_channel_flush(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-reset: playback flush error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-reset: playback flush error: %s\n", snd_strerror(err)); return; } if ((err = snd_pcm_channel_prepare(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-reset: channel prepare error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-reset: channel prepare error: %s\n", snd_strerror(err)); return; } } @@ -292,13 +292,13 @@ if ((err = snd_pcm_playback_drain(alsa_handler)) < 0) { - printf("alsa-pause: playback drain error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-pause: playback drain error: %s\n", snd_strerror(err)); return; } if ((err = snd_pcm_channel_flush(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-pause: playback flush error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-pause: playback flush error: %s\n", snd_strerror(err)); return; } } @@ -309,7 +309,7 @@ int err; if ((err = snd_pcm_channel_prepare(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-resume: channel prepare error: %s\n", snd_strerror(err)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-resume: channel prepare error: %s\n", snd_strerror(err)); return; } } @@ -320,27 +320,33 @@ */ static int play(void* data, int len, int flags) { - if ((len = snd_pcm_write(alsa_handler, data, len)) != len) + int got_len; + + if (!len) + return(0); + + if ((got_len = snd_pcm_write(alsa_handler, data, len)) < 0) { - if (len == -EPIPE) /* underrun? */ + if (got_len == -EPIPE) /* underrun? */ { - printf("alsa-play: alsa underrun, resetting stream\n"); - if ((len = snd_pcm_channel_prepare(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) + mp_msg(MSGT_AO, MSGL_ERR, "alsa-play: alsa underrun, resetting stream\n"); + if ((got_len = snd_pcm_channel_prepare(alsa_handler, SND_PCM_CHANNEL_PLAYBACK)) < 0) { - printf("alsa-play: playback prepare error: %s\n", snd_strerror(len)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-play: playback prepare error: %s\n", snd_strerror(got_len)); return(0); } - if ((len = snd_pcm_write(alsa_handler, data, len)) != len) + if ((got_len = snd_pcm_write(alsa_handler, data, len)) < 0) { - printf("alsa-play: write error after reset: %s - giving up\n", - snd_strerror(len)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-play: write error after reset: %s - giving up\n", + snd_strerror(got_len)); return(0); } - return(len); /* 2nd write was ok */ + return(got_len); /* 2nd write was ok */ } - printf("alsa-play: output error: %s\n", snd_strerror(len)); + mp_msg(MSGT_AO, MSGL_ERR, "alsa-play: output error: %s\n", snd_strerror(got_len)); + return(0); } - return(len); + return(got_len); } /* how many byes are free in the buffer */

1 0

CVS: main mp_msg.c,1.13,1.14
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv29250 Modified Files: mp_msg.c Log Message: disabling gtk messagebox - fixes gtk crashes Index: mp_msg.c =================================================================== RCS file: /cvsroot/mplayer/main/mp_msg.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mp_msg.c 23 Mar 2002 19:29:48 -0000 1.13 +++ mp_msg.c 29 Apr 2002 16:44:42 -0000 1.14 @@ -47,7 +47,7 @@ vsnprintf(tmp, 2048, mp_gettext(format), va); tmp[2047] = 0; -#if defined(HAVE_NEW_GUI) && !defined(HAVE_MENCODER) +#if defined(HAVE_NEW_GUI) && !defined(HAVE_MENCODER) && 0 if(use_gui) { switch(x & 255) @@ -76,7 +76,7 @@ va_list va; if((x&255)>mp_msg_levels[x>>8]) return; // do not display va_start(va, format); -#if defined( HAVE_NEW_GUI ) && !defined( HAVE_MENCODER ) +#if defined( HAVE_NEW_GUI ) && !defined( HAVE_MENCODER ) && 0 if(use_gui){ char tmp[16*80]; vsnprintf( tmp,8*80,format,va ); tmp[8*80-1]=0;

1 0

CVS: main configure,1.453,1.454
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv21351 Modified Files: configure Log Message: more compatible libpng version check Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.453 retrieving revision 1.454 diff -u -r1.453 -r1.454 --- configure 28 Apr 2002 21:05:09 -0000 1.453 +++ configure 29 Apr 2002 16:24:22 -0000 1.454 @@ -2264,8 +2264,8 @@ #include <string.h> int main(void) { printf("png.h : %s\n", PNG_LIBPNG_VER_STRING); - printf("libpng: %s\n", png_get_libpng_ver(NULL)); - return (strcmp(PNG_LIBPNG_VER_STRING, png_get_libpng_ver(NULL))); + printf("libpng: %s\n", png_libpng_ver); + return (strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver)); } EOF if cc_check -lpng -lz -lm ; then

1 0

CVS: main/libmpcodecs vd_raw.c,1.4,1.5
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv14102 Modified Files: vd_raw.c Log Message: 8bpp raw avi support Index: vd_raw.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_raw.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vd_raw.c 23 Mar 2002 14:26:53 -0000 1.4 +++ vd_raw.c 29 Apr 2002 16:03:37 -0000 1.5 @@ -32,6 +32,7 @@ // set format fourcc for raw RGB: if(sh->format==0){ switch(sh->bih->biBitCount){ + case 8: sh->format=IMGFMT_BGR8; break; case 15: case 16: sh->format=IMGFMT_BGR15; break; case 24: sh->format=IMGFMT_BGR24; break; @@ -72,6 +73,10 @@ } else { mpi->planes[0]=data; mpi->stride[0]=mpi->width*(mpi->bpp/8); + if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8){ + // export palette: + mpi->planes[1]=((unsigned char*)&sh->bih)+40; + } } return mpi;

1 0

CVS: main/libmpdemux video.c,1.16,1.17
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv11785 Modified Files: video.c Log Message: ugly workaround disabled Index: video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- video.c 12 Apr 2002 10:48:21 -0000 1.16 +++ video.c 29 Apr 2002 15:57:22 -0000 1.17 @@ -33,6 +33,7 @@ case DEMUXER_TYPE_ASF: { // display info: +#if 0 if(sh_video->bih->biCompression == BI_RGB && (sh_video->video.fccHandler == mmioFOURCC('D', 'I', 'B', ' ') || sh_video->video.fccHandler == mmioFOURCC('R', 'G', 'B', ' ') || @@ -41,6 +42,7 @@ sh_video->format = mmioFOURCC(0, 'R', 'G', 'B') | sh_video->bih->biBitCount; } else +#endif sh_video->format=sh_video->bih->biCompression; sh_video->disp_w=sh_video->bih->biWidth;

1 0

CVS: main/libmpdemux demuxer.c,1.95,1.96
by Alban Bedel CVS 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv21315/libmpdemux Modified Files: demuxer.c Log Message: Add support for another AVI with ogg/vorbis audio (0x674F) Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- demuxer.c 24 Apr 2002 17:28:23 -0000 1.95 +++ demuxer.c 29 Apr 2002 13:36:18 -0000 1.96 @@ -800,8 +800,22 @@ demuxer = (demuxer_t*) demux_open_avi(demuxer); if(!demuxer) return NULL; // failed to open sh_a = (sh_audio_t*)demuxer->audio->sh; - if(demuxer->audio->id != -2 && sh_a && sh_a->format == 0xFFFE) - demuxer = init_avi_with_ogg(demuxer); + if(demuxer->audio->id != -2 && sh_a) { + if(sh_a->format == 0xFFFE) + demuxer = init_avi_with_ogg(demuxer); + else if(sh_a->format == 0x674F) { + stream_t* s; + demuxer_t *od; + s = new_ds_stream(demuxer->audio); + od = new_demuxer(s,DEMUXER_TYPE_OGG,-1,-2,-2); + if(!demux_ogg_open(od)) { + mp_msg( MSGT_DEMUXER,MSGL_ERR,"Unable to open the ogg demuxer\n"); + free_stream(s); + demuxer->audio->id = -2; + } else + demuxer = new_demuxers_demuxer(demuxer,od,demuxer); + } + } return demuxer; // break; }

1 0