MplayerXP-mplayer with extra performance

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20880

Modified Files:
	demux_aiff.c 
Log Message:
10L

Index: demux_aiff.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_aiff.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- demux_aiff.c	24 Nov 2004 18:11:57 -0000	1.3
+++ demux_aiff.c	25 Nov 2004 17:52:38 -0000	1.4
@@ -133,6 +133,7 @@ static demuxer_t* aiff_open(demuxer_t* d
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
 	demux_info_add(demuxer, INFOT_NAME, buf);
+	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','U','T','H'))
@@ -141,6 +142,7 @@ static demuxer_t* aiff_open(demuxer_t* d
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
 	demux_info_add(demuxer, INFOT_AUTHOR, buf);
+	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('(','c',')',' '))
@@ -149,6 +151,7 @@ static demuxer_t* aiff_open(demuxer_t* d
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
 	demux_info_add(demuxer, INFOT_COPYRIGHT, buf);
+	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','N','N','O'))
@@ -157,8 +160,13 @@ static demuxer_t* aiff_open(demuxer_t* d
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
 	demux_info_add(demuxer, INFOT_DESCRIPTION, buf);
+	if(priv->verc && (chunk_size&1)) stream_read_char(s);
+    }
+    else
+    {
+	if(priv->verc && (chunk_size&1)) chunk_size++;
+	stream_skip(s,chunk_size); /*unknown chunk type */
     }
-    else stream_skip(s,chunk_size); /*unknown chunk type */
   }
   if(!w->nAvgBytesPerSec) { MSG_V("COMM chunk not found\n"); return NULL; /* memleak here!!! */}
   if(!demuxer->movi_start) { MSG_V("SSND(APCM) chunks not found\n"); return NULL; /* memleak here!!! */}

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10236

Modified Files:
	demux_aiff.c demux_audio.c 
Log Message:
new streams

Index: demux_aiff.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_aiff.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -u -d -r1.2 -r1.3
--- demux_aiff.c	11 Oct 2004 15:20:58 -0000	1.2
+++ demux_aiff.c	24 Nov 2004 18:11:57 -0000	1.3
@@ -9,6 +9,27 @@
 #include "stheader.h"
 #include "../cfgparser.h"
 
+static unsigned long cvt_extended(char * buf)
+{
+    unsigned long mantissa,last=0;
+    unsigned char exp;
+    mantissa=be2me_32(*(uint32_t *)&buf[2]);
+    exp=30-buf[1];
+    while(exp--)
+    {
+	last=mantissa;
+	mantissa>>=1;
+    }
+    if(last&0x00000001) mantissa++;
+    return mantissa;
+}
+
+
+typedef struct priv_s
+{
+    int verc;
+}priv_t;
+
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 
 static int aiff_probe(demuxer_t* demuxer) 
@@ -18,6 +39,7 @@ static int aiff_probe(demuxer_t* demuxer
   s = demuxer->stream;
   stream_read(s,buf,12);
   if(*((uint32_t *)&buf[0])==mmioFOURCC('F','O','R','M') && *((uint32_t *)&buf[8])==mmioFOURCC('A','I','F','F')) return 1;
+  if(*((uint32_t *)&buf[0])==mmioFOURCC('F','O','R','M') && *((uint32_t *)&buf[8])==mmioFOURCC('A','I','F','C')) return 1;
   return 0;
 }
 
@@ -25,9 +47,13 @@ static demuxer_t* aiff_open(demuxer_t* d
   sh_audio_t* sh_audio;
   WAVEFORMATEX* w;
   stream_t *s;
+  priv_t *priv;
+  char preamble[8];
   s = demuxer->stream;
 
   sh_audio = new_sh_audio(demuxer,0);
+  priv=demuxer->priv=malloc(sizeof(priv_t));
+  memset(priv,0,sizeof(priv_t));
   sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
   w->wFormatTag = 0x1; sh_audio->format = mmioFOURCC('r','a','w',' '); /* S16BE */
   w->nChannels = sh_audio->channels =
@@ -38,42 +64,108 @@ static demuxer_t* aiff_open(demuxer_t* d
   w->wBitsPerSample = 8*sh_audio->samplesize;
   w->cbSize = 0;
   stream_reset(s);
-  stream_seek(s,12);
+  stream_seek(s,8);
+  if(stream_read(s,preamble,4)!=4) return NULL;
+  if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','I','F','C')) priv->verc=1;
+  demuxer->movi_start=0;
   while(1)
   {
-    char preamble[8];
     unsigned frames=0;
     int chunk_size;
-    if(stream_read(s,preamble,8)!=8) return NULL;
+    if(stream_read(s,preamble,8)!=8) break;
     chunk_size=be2me_32(*((uint32_t *)&preamble[4]));
+    MSG_V("Got preamble: %c%c%c%c\n",preamble[0],preamble[1],preamble[2],preamble[3]);
+    if(*((uint32_t *)&preamble[0])==mmioFOURCC('F','V','E','R'))
+    {
+	if(be2me_32(*((uint32_t *)&preamble[4]))!=4)
+	{
+	    MSG_V("Wrong length of VFER chunk %lu\n",be2me_32(*((uint32_t *)&preamble[4])));
+	    return NULL;
+	}
+	if(stream_read(s,preamble,4)!=4) return NULL;
+	if(be2me_32(*((uint32_t *)&preamble[0])) == 0xA2805140)	priv->verc=1;
+	else
+	{
+	    MSG_V("Unknown VFER chunk found %08X\n",be2me_32(*((uint32_t *)&preamble[0])));
+	    return NULL;
+	}
+    }
+    else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('C','O','M','M'))
     {
 	char buf[chunk_size];
+	unsigned clen=priv->verc?22:18;
+	if(chunk_size < clen)
+	{
+	    MSG_V("Invalid COMM length %u\n",chunk_size);
+	    return NULL;
+	}
 	if(stream_read(s,buf,chunk_size)!=chunk_size) return NULL;
 	w->nChannels = sh_audio->channels = be2me_16(*((uint16_t *)&buf[0]));
 	frames=be2me_32(*((uint32_t *)&buf[2]));
 	w->wBitsPerSample = be2me_16(*((uint16_t *)&buf[6]));
 	sh_audio->samplesize = w->wBitsPerSample/8;
-	w->nSamplesPerSec = sh_audio->samplerate = be2me_16(*((uint16_t *)&buf[10]));
+	w->nSamplesPerSec = sh_audio->samplerate = cvt_extended(&buf[8]);
 	w->nAvgBytesPerSec = sh_audio->samplerate*sh_audio->samplesize*sh_audio->channels;
 	w->nBlockAlign = sh_audio->channels*sh_audio->samplesize;
-	MSG_V("AIFF: ch %u frames %u bps %u rate %u\n",sh_audio->channels,frames,w->wBitsPerSample,sh_audio->samplerate);
+	if(priv->verc)
+	{
+	    sh_audio->format = *((uint32_t *)&buf[18]);
+	    if(sh_audio->format == mmioFOURCC('N','O','N','E')) sh_audio->format=mmioFOURCC('r','a','w',' ');
+	    MSG_V("AIFC: fourcc %08X ch %u frames %u bps %u rate %u\n",sh_audio->format,sh_audio->channels,frames,w->wBitsPerSample,sh_audio->samplerate);
+	}
+	else
+	    MSG_V("AIFF: ch %u frames %u bps %u rate %u\n",sh_audio->channels,frames,w->wBitsPerSample,sh_audio->samplerate);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('S','S','N','D') ||
        *((uint32_t *)&preamble[0])==mmioFOURCC('A','P','C','M'))
     {
-	demuxer->movi_start=stream_tell(s);
-	demuxer->movi_end=demuxer->movi_start+sh_audio->channels*sh_audio->samplesize*frames;
-	/* Done! play it */
-	break;
+	demuxer->movi_start=stream_tell(s)+8;
+	demuxer->movi_end=demuxer->movi_start+chunk_size;
+	if(priv->verc && (chunk_size&1)) chunk_size++;
+	stream_skip(s,chunk_size);
+    }
+    else
+    if(*((uint32_t *)&preamble[0])==mmioFOURCC('N','A','M','E'))
+    {
+	char buf[chunk_size+1];
+	stream_read(s,buf,chunk_size);
+	buf[chunk_size]=0;
+	demux_info_add(demuxer, INFOT_NAME, buf);
+    }
+    else
+    if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','U','T','H'))
+    {
+	char buf[chunk_size+1];
+	stream_read(s,buf,chunk_size);
+	buf[chunk_size]=0;
+	demux_info_add(demuxer, INFOT_AUTHOR, buf);
+    }
+    else
+    if(*((uint32_t *)&preamble[0])==mmioFOURCC('(','c',')',' '))
+    {
+	char buf[chunk_size+1];
+	stream_read(s,buf,chunk_size);
+	buf[chunk_size]=0;
+	demux_info_add(demuxer, INFOT_COPYRIGHT, buf);
+    }
+    else
+    if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','N','N','O'))
+    {
+	char buf[chunk_size+1];
+	stream_read(s,buf,chunk_size);
+	buf[chunk_size]=0;
+	demux_info_add(demuxer, INFOT_DESCRIPTION, buf);
     }
     else stream_skip(s,chunk_size); /*unknown chunk type */
   }
-
+  if(!w->nAvgBytesPerSec) { MSG_V("COMM chunk not found\n"); return NULL; /* memleak here!!! */}
+  if(!demuxer->movi_start) { MSG_V("SSND(APCM) chunks not found\n"); return NULL; /* memleak here!!! */}
   demuxer->movi_length = (demuxer->movi_end-demuxer->movi_start)/w->nAvgBytesPerSec;
   demuxer->audio->sh = sh_audio;
   sh_audio->ds = demuxer->audio;
+  stream_seek(s,demuxer->movi_start);
   return demuxer;
 }
 
@@ -113,7 +205,10 @@ static void aiff_seek(demuxer_t *demuxer
   resync_audio_stream(sh_audio);
 }
 
-static void aiff_close(demuxer_t* demuxer) {}
+static void aiff_close(demuxer_t* demuxer)
+{
+    free(demuxer->priv);
+}
 
 demuxer_driver_t demux_aiff =
 {

Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_audio.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -p -u -d -r1.24 -r1.25
--- demux_audio.c	20 Nov 2004 08:20:59 -0000	1.24
+++ demux_audio.c	24 Nov 2004 18:11:57 -0000	1.25
@@ -24,6 +24,7 @@
 #define SND_AU 6
 #define AC3 7
 #define VOC 8
+#define MUSEPACK 9
 
 #define HDR_SIZE 4
 
@@ -455,6 +456,8 @@ static int audio_probe(demuxer_t* demuxe
   else
   if(p[0] == 'I' && p[1] == 'D' && p[2] == '3' && (p[3] >= 2)) return 1;
   else
+  if(p[0] == 'M' && p[1] == 'P' && p[2] == '+' && (p[3] >= 4 && p[3] <= 0x20)) return 1;
+  else
   if(fcc1 == mmioFOURCC('f','L','a','C')) return 1;
   else
   if(fcc1 == mmioFOURCC('.','s','n','d')) return 1;
@@ -609,6 +612,12 @@ static demuxer_t* audio_open(demuxer_t* 
 	break;
     }
     else
+    if( hdr[0] == 'M' && hdr[1] == 'P' && hdr[2] == '+' && (hdr[3] >= 4 && hdr[3] <= 0x20))
+    {
+	frmt=MUSEPACK;
+	break;
+    }
+    else
     {
 	int fmt;
 	char b[32];
@@ -750,6 +759,38 @@ static demuxer_t* audio_open(demuxer_t* 
     sh_audio->format = 0x2000;
     if(!read_ac3_tags(demuxer,hdr,pos,&sh_audio->i_bps,&sh_audio->samplerate,&sh_audio->channels)) return 0;
     break;
+  case MUSEPACK:
+  {
+    uint32_t hdata;
+    uint32_t frames,ms,profile,encv,sver;
+    sh_audio->format = mmioFOURCC('M','P','+',' ');
+    if(hdr[3] >= 7) /* version*/
+    {
+	const unsigned stable[4]={ 44100, 48000, 37800, 32000 };
+	frames=stream_read_dword_le(s);
+	hdata=stream_read_dword_le(s);
+	ms=(hdata<<1)>>31;
+	profile=(hdata>>20)&15;
+	sh_audio->samplerate=stable[(hdata>>16)&3];
+	stream_skip(s,12);
+	hdata=stream_read_dword_le(s);
+	encv=hdata>>24;
+	sver=hdr[3];
+	sh_audio->i_bps=8*s->end_pos/(frames*1152.e3/sh_audio->samplerate);
+    }
+    else
+    {
+	uint32_t *phdr=&hdr[0];
+	sh_audio->i_bps= (*phdr)>>23;
+	frames=stream_read_dword_le(s);
+	sh_audio->samplerate=44100;
+	ms=((*phdr)<<10)>>31;
+	sver=((*phdr)<<11)>>22;
+	if(sver<5) frames >>=16;
+	if(sver<6) frames--; /* bugfix: invalid last frame prior SV6 */
+    }
+    break;
+  }    
   case VOC:
   {
     char chunk[4];

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28958

Modified Files:
	demux_fli.c 
Log Message:
fill bitmapinfoheader too

Index: demux_fli.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_fli.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -p -u -d -r1.6 -r1.7
--- demux_fli.c	5 Oct 2004 16:35:44 -0000	1.6
+++ demux_fli.c	23 Nov 2004 16:43:21 -0000	1.7
@@ -136,7 +136,12 @@ static demuxer_t* fli_open(demuxer_t* de
   // pass extradata to codec
   sh_video->bih = (BITMAPINFOHEADER*)header;
   sh_video->bih->biSize = sizeof(BITMAPINFOHEADER) + 128;
-    
+  sh_video->bih->biCompression=sh_video->format;
+  sh_video->bih->biWidth=sh_video->disp_w;
+  sh_video->bih->biPlanes=0;
+  sh_video->bih->biBitCount=0; /* depth */
+  sh_video->bih->biHeight=sh_video->disp_h;
+  sh_video->bih->biSizeImage=sh_video->bih->biWidth*sh_video->bih->biHeight;
   // skip the video depth and flags
   stream_skip(demuxer->stream, 4);

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28432

Modified Files:
	demux_real.c 
Log Message:
10L

Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_real.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -p -u -d -r1.22 -r1.23
--- demux_real.c	23 Oct 2004 15:10:16 -0000	1.22
+++ demux_real.c	23 Nov 2004 16:41:10 -0000	1.23
@@ -846,7 +846,7 @@ static demuxer_t* real_open(demuxer_t* d
 #endif
 
 #ifdef MP_DEBUG
-#define stream_skip(st,siz) { int i; for(i=0;i<siz;i++) MSG_V(" %02X",stream_read_char(st)); MSG_V("\n");}
+#define stream_skip(st,siz) { char ch; int i; for(i=0;i<siz;i++) ch=stream_read_char(st); MSG_V(" %02X",ch); MSG_V("\n");}
 #endif
 
 		if (tmp == MKTAG(0xfd, 'a', 'r', '.'))

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28006

Modified Files:
	demux_mov.c 
Log Message:
better svq3 support

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_mov.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -p -u -d -r1.23 -r1.24
--- demux_mov.c	19 Nov 2004 07:41:41 -0000	1.23
+++ demux_mov.c	23 Nov 2004 16:39:51 -0000	1.24
@@ -33,9 +33,7 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#ifdef USE_QTX_CODECS
-#include "../loader/qtx/qtxsdk/components.h"
-#endif
+#include "../../loader/qtx/qtxsdk/components.h"
 
 #ifdef HAVE_ZLIB
 #include <zlib.h>
@@ -1037,7 +1035,6 @@ static void lschunks(demuxer_t* demuxer,
 //      82  char[4]	atom type
 //	86  ...		atom data
 
-#ifdef USE_QTX_CODECS
 	{	ImageDescription* id=malloc(8+trak->stdata_len);
 		trak->desc=id;
 		id->idSize=8+trak->stdata_len;
@@ -1059,7 +1056,6 @@ static void lschunks(demuxer_t* demuxer,
 		if(trak->stdata_len>78)	memcpy(((char*)&id->clutID)+2,trak->stdata+78,trak->stdata_len-78);
 		sh->ImageDesc=id;
 	}
-#endif
 
 		if(trak->stdata_len >= 86) { // extra atoms found
 		  int pos=78;

Update of /cvsroot/mplayerxp/mplayerxp/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27704

Modified Files:
	codecs.conf 
Log Message:
remove unsupported stuff

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/etc/codecs.conf,v
retrieving revision 1.47
retrieving revision 1.48
diff -p -u -d -r1.47 -r1.48
--- codecs.conf	20 Nov 2004 08:22:18 -0000	1.47
+++ codecs.conf	23 Nov 2004 16:38:34 -0000	1.48
@@ -1775,12 +1775,13 @@ audiocodec raatrc
   driver realaud
   dll "/opt/RealPlayer8/Codecs/atrc.so.6.0"
 
-audiocodec imaadpcm
+audiocodec ffimaadpcm
   info "IMA ADPCM"
   status working
   format 0x11
   fourcc ima4 ; (MOV files)
-  driver imaadpcm
+  driver ffmpeg
+  dll "adpcm_ima_qt"
 
 audiocodec pcm
   info "Uncompressed PCM"
@@ -1871,14 +1872,6 @@ audiocodec ffmp2
   dll "mp2"
   flags seekable
 
-audiocodec ffimaadpcm
-  info "FFMpeg's IMA ADPCM"
-  status working
-  format 0x11
-  fourcc "ima4" ; (MOV files)
-  driver ffmpeg
-  dll adpcm_ima_wav
-
 audiocodec ffmsadpcm
   info "FFMpeg's MS ADPCM"
   status working

Update of /cvsroot/mplayerxp/mplayerxp/codecs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32601

Modified Files:
	configure libavcodec.diff 
Log Message:
sync with latest ffmpeg's changes

Index: configure
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/codecs/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -p -u -d -r1.9 -r1.10
--- configure	11 Nov 2004 17:50:50 -0000	1.9
+++ configure	22 Nov 2004 17:22:17 -0000	1.10
@@ -723,6 +723,11 @@ $_def_mvi
 #define CONFIG_GPL 1
 $_def_pthread
 
+#ifdef HAVE_PTHREADS
+/* BeOS workaround */
+#define HAVE_THREADS 1
+#endif
+
 $_def_fastcall
 
 /* Defined to some form of __attribute__ ((...)) if the compiler supports

Index: libavcodec.diff
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/codecs/libavcodec.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- libavcodec.diff	12 Oct 2004 15:31:27 -0000	1.3
+++ libavcodec.diff	22 Nov 2004 17:22:17 -0000	1.4
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Oct 11 02:03:36 2004
-+++ Makefile	Tue Oct 12 12:05:24 2004
-@@ -281,21 +281,16 @@
+--- Makefile.orig	2004-11-22 19:08:49.000000000 +0000
++++ Makefile	2004-11-22 20:03:07.000000000 +0000
+@@ -285,21 +285,16 @@
  	$(CC) -o $@ $^ -lm
  
  ifeq ($(BUILD_SHARED),yes)

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8157/mplayerxp

Modified Files:
	codec-cfg.c 
Log Message:
register new fourcc for codecs

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/codec-cfg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -p -u -d -r1.11 -r1.12
--- codec-cfg.c	19 Feb 2004 18:38:53 -0000	1.11
+++ codec-cfg.c	20 Nov 2004 08:22:19 -0000	1.12
@@ -128,22 +128,60 @@ static struct {
 {"UYVY",  IMGFMT_UYVY},
 {"YVYU",  IMGFMT_YVYU},
 
+{"CLPL",  IMGFMT_CLPL},
+{"CLJR",  IMGFMT_CLJR},
+{"CYUV",  IMGFMT_cyuv},
+
 {"444P",  IMGFMT_444P},
 {"422P",  IMGFMT_422P},
 {"411P",  IMGFMT_411P},
 
+{"NV12",  IMGFMT_NV12},
+{"NV21",  IMGFMT_NV21},
+{"HM12",  IMGFMT_HM12},
+
+{"IY41",  IMGFMT_IY41},
+{"IYU1",  IMGFMT_IYU1},
+{"IYU2",  IMGFMT_IYU2},
+
+{"Y422",  IMGFMT_Y422},
+{"Y211",  IMGFMT_Y211},
+{"Y41P",  IMGFMT_Y41P},
+{"Y41T",  IMGFMT_Y41T},
+{"Y42T",  IMGFMT_Y42T},
+{"YUNV",  IMGFMT_YUNV},
+{"IYU2",  IMGFMT_IYU2},
+{"V422",  IMGFMT_V422},
+{"V655",  IMGFMT_V655},
+{"YUVP",  IMGFMT_YUVP},
+{"UYVP",  IMGFMT_UYVP},
+
+{"RGB4",  IMGFMT_RGB|4},
 {"RGB8",  IMGFMT_RGB|8},
 {"RGB15", IMGFMT_RGB|15}, 
 {"RGB16", IMGFMT_RGB|16},
 {"RGB24", IMGFMT_RGB|24},
 {"RGB32", IMGFMT_RGB|32},
+{"RGBA",  IMGFMT_RGBA},
+{"ARGB",  IMGFMT_ARGB},
+{"RGB1",  IMGFMT_RGB|1},
+
+{"BGR4",  IMGFMT_BGR|4},
 {"BGR8",  IMGFMT_BGR|8},
 {"BGR15", IMGFMT_BGR|15},
 {"BGR16", IMGFMT_BGR|16},
 {"BGR24", IMGFMT_BGR|24},
 {"BGR32", IMGFMT_BGR|32},
+{"BGRA",  IMGFMT_BGRA},
+{"ABGR",  IMGFMT_ABGR},
+{"BGR1",  IMGFMT_BGR|1},
 
 {"MPES",  IMGFMT_MPEGPES},
+{"JPEGNI", IMGFMT_ZRMJPEGNI},
+{"JPEGIT", IMGFMT_ZRMJPEGIT},
+{"JPEGIB", IMGFMT_ZRMJPEGIB},
+{"MOCO_MPEG2",  IMGFMT_XVMC_MOCO_MPEG2},
+{"IDCT_MPEG2",  IMGFMT_XVMC_IDCT_MPEG2},
 {NULL,    0}
 };

Update of /cvsroot/mplayerxp/mplayerxp/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8157/etc

Modified Files:
	codecs.conf 
Log Message:
register new fourcc for codecs

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/etc/codecs.conf,v
retrieving revision 1.46
retrieving revision 1.47
diff -p -u -d -r1.46 -r1.47
--- codecs.conf	18 Nov 2004 09:27:34 -0000	1.46
+++ codecs.conf	20 Nov 2004 08:22:18 -0000	1.47
@@ -12,6 +12,18 @@ videocodec mpegpes
   dll "mpegpes"
   out MPES
 
+videocodec ffmpeg12mc
+  info "FFmpeg MPEG 1/2 (XvMC)"
+  status buggy
+  format 0x10000001  ; mpeg 1
+  format 0x10000002  ; mpeg 2
+  fourcc mpg1,mpg2
+  fourcc PIM1        ; Pinnacle hardware-mpeg1
+  driver ffmpeg
+  dll "mpegvideo_xvmc"
+  out IDCT_MPEG2
+  out MOCO_MPEG2
+
 videocodec mpeg12
   info "MPEG 1 or 2"
   comment "with postprocessing"
@@ -1671,21 +1683,21 @@ videocodec null
 audiocodec ffra144
   info "FFmpeg's RealAudio 1.0"
   status working
-  format 0x345F3431 ; "14_4"
+  fourcc 14_4
   driver ffmpeg
   dll "real_144"
 
 audiocodec ffra288
   info "FFmpeg's RealAudio 2.0"
   status working
-  format 0x385F3832 ; "28_8"
+  fourcc 28_8
   driver ffmpeg
   dll "real_288"
 
 audiocodec ra144
   info "RealAudio 1.0"
   status working
-  format 0x345F3431 ; "14_4"
+  fourcc 14_4
   driver realaud
   dll "/opt/RealPlayer8/Codecs/14_4.so.6.0"
   
@@ -1699,7 +1711,7 @@ audiocodec ffroqaudio
 audiocodec ffflac
   info "FFmpeg FLAC audio decoder"
   status working
-  format 0x43614C66
+  fourcc fLaC
   driver ffmpeg
   dll "flac"
 
@@ -1737,7 +1749,7 @@ audiocodec faad
 audiocodec ra288
   info "RealAudio 2.0"
   status working
-  format 0x385F3832 ; "28_8"
+  fourcc 28_8
   driver realaud
   dll "/opt/RealPlayer8/Codecs/28_8.so.6.0"
 
@@ -1745,21 +1757,21 @@ audiocodec ra288
 audiocodec racook
   info "RealAudio COOK"
   status untested
-  format 0x6B6F6F63 ; "cook"
+  fourcc cook
   driver realaud
   dll "/opt/RealPlayer8/Codecs/cook.so.6.0"
 
 audiocodec rasipr
   info "RealAudio Sipro"
   status working
-  format 0x72706973 ; "sipr"
+  fourcc sipr
   driver realaud
   dll "/opt/RealPlayer8/Codecs/sipr.so.6.0"
 
 audiocodec raatrc
   info "RealAudio ATRAC3"
   status working
-  format 0x63727461 ; "atrc"
+  fourcc atrc
   driver realaud
   dll "/opt/RealPlayer8/Codecs/atrc.so.6.0"
 
@@ -1767,15 +1779,15 @@ audiocodec imaadpcm
   info "IMA ADPCM"
   status working
   format 0x11
-  format 0x34616d69  ; "ima4" (MOV files)
+  fourcc ima4 ; (MOV files)
   driver imaadpcm
 
 audiocodec pcm
   info "Uncompressed PCM"
   status working
   format 0x1
-  format 0x20776172  ; "raw " (MOV files)
-  format 0x736f7774  ; "twos" (MOV files)
+  fourcc "raw " ; (MOV files)
+  fourcc "twos" ; (MOV files)
 ;;;; these are for hardware support only:  (alaw,ulaw,ima-adpcm,mpeg,ac3)
 ;  format 0x6
 ;  format 0x7
@@ -1800,7 +1812,7 @@ audiocodec mp3
   comment "Optimized to MMX/SSE/3Dnow!"
   format 0x50
   format 0x55
-  format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
+  fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
   format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
   driver mp3lib
   dll "mp3lib (mpglib)"
@@ -1845,7 +1857,7 @@ audiocodec ffmp3
   info "FFmpeg layer-3 audio decoder - integer only"
   status working
   format 0x55
-  format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
+  fourcc ".mp3" ;  CBR/VBR MP3 (MOV files)
   format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
   driver ffmpeg
   dll "mp3"
@@ -1863,7 +1875,7 @@ audiocodec ffimaadpcm
   info "FFMpeg's IMA ADPCM"
   status working
   format 0x11
-  format 0x34616d69  ; "ima4" (MOV files)
+  fourcc "ima4" ; (MOV files)
   driver ffmpeg
   dll adpcm_ima_wav
 
@@ -1976,7 +1988,7 @@ audiocodec ffalaw
   info "FFMPEG's aLaw"
   status working
   format 0x6
-  format 0x77616C61 ; 'alaw', .mov files
+  fourcc alaw ; .mov files
   driver ffmpeg
   dll "pcm_alaw"
 
@@ -1984,7 +1996,7 @@ audiocodec ffulaw
   info "FFMPEG's uLaw"
   status working
   format 0x7
-  format 0x77616c75  ; "ulaw" (MOV files)
+  fourcc ulaw ; (MOV files)
   driver ffmpeg
   dll "pcm_mulaw"
 
@@ -2112,7 +2124,7 @@ audiocodec lhacm
 audiocodec TwinVQ
   info "VQF codec by NTTLabs"
   status working
-  format 0x4E495754 ; TWIN
+  fourcc TWIN
   driver vqf
   dll "tvqdec.dll"
 
@@ -2134,28 +2146,27 @@ audiocodec sc4
 audiocodec qdmc
   info "Quicktime QDMC/QDM2 audio decoders"
   status working
-  format 0x324D4451 ; "QDM2"
-  format 0x434D4451 ; "QDMC"
+  fourcc QDM2,QDMC
   driver qtaudio
   dll "QuickTime.qts"
 
 audiocodec qclp
   info "Quicktime QCLP audio decoder"
   status working
-  format 0x706C6351 ; "QCLP"
+  fourcc QCLP
   driver qtaudio
   dll "QuickTime.qts"
 
 audiocodec qtmace3
   info "Quicktime MACE3 audio decoder"
   status working
-  format 0x3343414D ; "MAC3"
+  fourcc MAC3
   driver qtaudio
   dll "QuickTime.qts"
 
 audiocodec qtmace6
   info "Quicktime MACE6 audio decoder"
   status working
-  format 0x3643414D ; "MAC6"
+  fourcc MAC6
   driver qtaudio
   dll "QuickTime.qts"

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7983

Modified Files:
	demux_audio.c 
Log Message:
sync with xine

Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_audio.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -p -u -d -r1.23 -r1.24
--- demux_audio.c	16 Nov 2004 07:27:39 -0000	1.23
+++ demux_audio.c	20 Nov 2004 08:20:59 -0000	1.24
@@ -23,6 +23,7 @@
 #define FLAC 5
 #define SND_AU 6
 #define AC3 7
+#define VOC 8
 
 #define HDR_SIZE 4
 
@@ -438,7 +439,7 @@ static int read_id3v2_tags(demuxer_t *de
 static int audio_probe(demuxer_t* demuxer)
 {
   uint32_t fcc,fcc1,fcc2;
-  char *p,b[HDR_SIZE*2];
+  char *p,b[32];
   stream_t *s;
   int is_mp3;
   s = demuxer->stream;
@@ -470,6 +471,7 @@ static int audio_probe(demuxer_t* demuxe
   stream_read(s,b,sizeof(b));
   /* ac3 header check */
   if(ac3_decode_header(b,&fcc,&fcc1,&fcc2)>0) return 1;
+  if(memcmp(b,"Creative Voice File\x1A",20)==0) return 1;
   return 0;
 }
 
@@ -609,7 +611,7 @@ static demuxer_t* audio_open(demuxer_t* 
     else
     {
 	int fmt;
-	char b[8];
+	char b[32];
 	MSG_DBG2("initial mp3_header: 0x%08X at %lu\n",*(uint32_t *)hdr,st_pos);
 	if((n = mp_decode_mp3_header(hdr,&fmt)) > 0)
 	{
@@ -620,14 +622,18 @@ static demuxer_t* audio_open(demuxer_t* 
 	    break;
 	}
 	memcpy(b,hdr,HDR_SIZE);
-	stream_read(s,&b[HDR_SIZE],8-HDR_SIZE);
+	stream_read(s,&b[HDR_SIZE],32-HDR_SIZE);
 	if((n = ac3_decode_header(b,&fmt,&fmt,&fmt)) > 0)
 	{
 	    demuxer->movi_start = st_pos;
 	    frmt = AC3;
 	    break;
 	}
-	
+	if(memcmp(b,"Creative Voice File\x1A",20)==0)
+	{
+	    frmt = VOC;
+	    break;
+	}
     }
     /* Add here some other audio format detection */
     if(step < HDR_SIZE) memmove(hdr,&hdr[step],HDR_SIZE-step);
@@ -643,12 +649,65 @@ static demuxer_t* audio_open(demuxer_t* 
   MSG_DBG2("mp3_header off: st_pos=%lu n=%lu HDR_SIZE=%u\n",st_pos,n,HDR_SIZE);
   switch(frmt) {
   case FLAC:
+  {
+    char chunk[4];
+    uint32_t block_size;
   	sh_audio->format = mmioFOURCC('f', 'L', 'a', 'C');
+	/* loop through the metadata blocks; use a do-while construct since there
+	* will always be 1 metadata block */
+	do {
+	    if(stream_read(s,chunk,4)!=4) return NULL;
+	    block_size=(chunk[1]<<16)|(chunk[2]<<8)|chunk[3];
+	    switch (chunk[0] & 0x7F) {
+		/* STREAMINFO */
+		case 0:
+		{
+		    char sinfo[block_size];
+		    WAVEFORMATEX* w;
+		    unsigned long long int total_samples;
+		    sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
+		    MSG_V("STREAMINFO metadata\n");
+		    if (block_size != 34) {
+			MSG_V("expected STREAMINFO chunk of %d bytes\n",block_size);
+			return 0;
+		    }
+		    if(stream_read(s,sinfo,block_size)!=block_size) return NULL;
+		    sh_audio->samplerate=be2me_32(*(uint32_t *)&sinfo[10]);
+		    sh_audio->channels=w->nChannels=((sh_audio->samplerate>>9)&0x07)+1;
+		    w->wBitsPerSample=((sh_audio->samplerate>>4)&0x1F)+1;
+		    sh_audio->samplesize=(w->wBitsPerSample+7)/8;
+		    sh_audio->samplerate>>=12;
+		    w->nSamplesPerSec=sh_audio->samplerate;
+		    w->nAvgBytesPerSec = sh_audio->samplerate*sh_audio->samplesize*sh_audio->channels;
+		    w->nBlockAlign = sh_audio->channels*sh_audio->samplesize;
+		    w->wBitsPerSample = 8*sh_audio->samplesize;
+		    w->cbSize = 0;
+		    total_samples = be2me_64(*(uint64_t *)&sinfo[10]) & 0x0FFFFFFFFFLL;  /* 36 bits */
+		    demuxer->movi_end=total_samples*sh_audio->samplesize;
+		    break;
+		}
+		/* VORBIS_COMMENT */
+		case 4:
+		/* CUESHEET */
+		case 5:
+		/* 6-127 are presently reserved */
+		default:
+		/* PADDING */
+		case 1:
+		/* SEEKTABLE */
+		case 3:
+		/* APPLICATION */
+		case 2:
+		    MSG_V("metadata %i size %u\n",chunk[0] & 0x7F,block_size);
+		    stream_skip(s,block_size);
+		    break;
+	    }
+	} while ((chunk[0] & 0x80) == 0);
 	demuxer->movi_start = stream_tell(s);
-	stream_reset(s);
-	stream_seek(s,s->start_pos);
+	demuxer->movi_end += demuxer->movi_start;
 	demux_audio.name="FLAC parser";
 	break;
+  }
   case SND_AU: {
 	unsigned hsize,dsize;
 	uint32_t id;
@@ -691,6 +750,36 @@ static demuxer_t* audio_open(demuxer_t* 
     sh_audio->format = 0x2000;
     if(!read_ac3_tags(demuxer,hdr,pos,&sh_audio->i_bps,&sh_audio->samplerate,&sh_audio->channels)) return 0;
     break;
+  case VOC:
+  {
+    char chunk[4];
+    unsigned size;
+    WAVEFORMATEX* w;
+    stream_seek(s,0x14);
+    stream_read(s,chunk,2);
+    size=le2me_16(*(uint16_t *)&chunk[0]);
+    stream_seek(s,size);
+    stream_read(s,chunk,4);
+    if(chunk[0]!=0x01) { MSG_V("VOC unknown block type %02X\n",chunk[0]); return NULL; }
+    size=chunk[1]|(chunk[2]<<8)|(chunk[3]<<16);
+    sh_audio->format = 0x01; /* PCM */
+    stream_read(s,chunk,2);
+    if(chunk[1]!=0) { MSG_V("VOC unknown compression type %02X\n",chunk[1]); return NULL; }
+    demuxer->movi_start=stream_tell(s);
+    demuxer->movi_end=demuxer->movi_start+size;
+    sh_audio->samplerate=256-(1000000/chunk[0]);
+    sh_audio->channels=1;
+    sh_audio->samplesize=1;
+    sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
+    w->wFormatTag = sh_audio->format;
+    w->nChannels = sh_audio->channels;
+    w->nSamplesPerSec = sh_audio->samplerate;
+    w->nAvgBytesPerSec = sh_audio->samplerate*sh_audio->samplesize*sh_audio->channels;
+    w->nBlockAlign = 1024;
+    w->wBitsPerSample = (sh_audio->samplesize+7)/8;
+    w->cbSize = 0;
+    break;
+  }
   case WAV: {
     off_t fpos,data_off=-1;
     unsigned int chunk_type;
@@ -895,6 +984,7 @@ static int audio_demux(demuxer_t *demuxe
 	return 1;
       }
     } break;
+  case FLAC :
   case SND_AU:
   case WAV : {
     int l = sh_audio->wf->nAvgBytesPerSec;
@@ -906,10 +996,10 @@ static int audio_demux(demuxer_t *demuxe
     ds_add_packet(ds,dp);
     return 1;
   }
-  case FLAC : {
-    int l = 65535;
+  case VOC : {
+    int l = 65536;
     demux_packet_t*  dp = new_demux_packet(l);
-    l = stream_read(s,dp->buffer,l);
+    l=stream_read(s,dp->buffer,l);
     resize_demux_packet(dp, l);
     priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + l/(float)sh_audio->i_bps;
     ds->pts = priv->last_pts - (ds_tell_pts(demux->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
@@ -1000,6 +1090,9 @@ static void audio_seek(demuxer_t *demuxe
   sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
   
   switch(priv->frmt) {
+  case AC3:
+  case VOC:
+  case FLAC:
   case SND_AU:
   case WAV:
     pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17806

Modified Files:
	mplayer.c 
Log Message:
seeking related fixes

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/mplayer.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -p -u -d -r1.194 -r1.195
--- mplayer.c	30 Oct 2004 13:16:11 -0000	1.194
+++ mplayer.c	19 Nov 2004 07:46:42 -0000	1.195
@@ -1735,15 +1735,6 @@ MSG_INFO("initial_audio_pts=%f a_eof=%i 
   return 0;
 }
 
-void mpxp_reset_vcache(void)
-{
- unsigned i;
- for(i=0;i<xp_threads;i++) if(pinfo[i].thread_name=="main") break;
-// mpxp_seek(i,NULL,NULL,0 );
- mpxp_seek(i,NULL,NULL,shva[dec_ahead_active_frame].v_pts );
- return;
-}
-
 void mpxp_seek( int xp_id, video_stat_t *vstat, int *osd_visible, float v_pts )
 {
   audio_eof=0;
@@ -1776,12 +1767,14 @@ void mpxp_seek( int xp_id, video_stat_t 
 
       if(sh_video){
 	 pinfo[xp_id].current_module="seek_video_reset";
+	 resync_video_stream(sh_video);
          vo_reset();
          sh_video->chapter_change=-1;
       }
       
       if(sh_audio){
         pinfo[xp_id].current_module="seek_audio_reset";
+	resync_audio_stream(sh_audio);
         ao_reset(); // stop audio, throwing away buffered data
       }
 #ifdef USE_OSD
@@ -1812,6 +1805,15 @@ void mpxp_seek( int xp_id, video_stat_t 
   }
 }
 
+void mpxp_reset_vcache(void)
+{
+ unsigned i;
+ for(i=0;i<xp_threads;i++) if(pinfo[i].thread_name=="main") break;
+// mpxp_seek(i,NULL,NULL,0 );
+ mpxp_seek(i,NULL,NULL,shva[dec_ahead_active_frame].v_pts );
+ return;
+}
+
 static void mpxp_stream_event_handler(struct stream_s *s,const stream_packet_t *sp)
 {
     MSG_V("DVD_EVENT: %u\n",s->type);

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/libmpcodecs

Modified Files:
	dec_video.c dec_video.h vd.h vd_libmpeg2.c 
Log Message:
seeking related fixes

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/dec_video.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -p -u -d -r1.27 -r1.28
--- dec_video.c	18 Nov 2004 09:23:50 -0000	1.27
+++ dec_video.c	19 Nov 2004 07:45:51 -0000	1.28
@@ -312,4 +312,8 @@ if(!(mpi->flags&(MP_IMGFLAG_DRAW_CALLBAC
   return 1;
 }
 
+void resync_video_stream(sh_video_t *sh_video)
+{
+  if(sh_video->inited) mpvdec->control(sh_video,VDCTRL_RESYNC_STREAM,NULL);
+}
 

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/dec_video.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -d -r1.4 -r1.5
--- dec_video.h	6 Jun 2002 08:02:20 -0000	1.4
+++ dec_video.h	19 Nov 2004 07:45:51 -0000	1.5
@@ -12,5 +12,6 @@ extern int get_video_quality_max(sh_vide
 extern void set_video_quality(sh_video_t *sh_video,int quality);
 
 int set_video_colors(sh_video_t *sh_video,char *item,int value);
+extern void resync_video_stream(sh_video_t *sh_video);
 
 extern int divx_quality;

Index: vd.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -p -u -d -r1.6 -r1.7
--- vd.h	2 Nov 2004 16:36:46 -0000	1.6
+++ vd.h	19 Nov 2004 07:45:51 -0000	1.7
@@ -36,6 +36,7 @@ extern vd_functions_t* mpcodecs_vd_drive
 #define VDCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */
 #define VDCTRL_SET_PP_LEVEL 5 /* set postprocessing level */
 #define VDCTRL_SET_EQUALIZER 6 /* set color options (brightness,contrast etc) */
+#define VDCTRL_RESYNC_STREAM 7 /* resync video stream if needed */
 
 // callbacks:
 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, void *tune);

Index: vd_libmpeg2.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_libmpeg2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -p -u -d -r1.17 -r1.18
--- vd_libmpeg2.c	13 Nov 2004 12:05:22 -0000	1.17
+++ vd_libmpeg2.c	19 Nov 2004 07:45:51 -0000	1.18
@@ -60,6 +60,8 @@ static void (*mpeg2_set_buf_ptr) (mpeg2d
 #define mpeg2_set_buf(a,b,c) (*mpeg2_set_buf_ptr)(a,b,c)
 static int (*mpeg2_stride_ptr) (mpeg2dec_t * mpeg2dec, int stride);
 #define mpeg2_stride(a,b) (*mpeg2_stride_ptr)(a,b)
+static void (*mpeg2_reset_ptr) (mpeg2dec_t * mpeg2dec, int full_reset);
+#define mpeg2_reset(a,b) (*mpeg2_reset_ptr)(a,b)
 
 static void *dll_handle;
 static int load_lib( const char *libname )
@@ -72,13 +74,24 @@ static int load_lib( const char *libname
   mpeg2_buffer_ptr = dlsym(dll_handle,"mpeg2_buffer");
   mpeg2_set_buf_ptr = dlsym(dll_handle,"mpeg2_set_buf");
   mpeg2_stride_ptr = dlsym(dll_handle,"mpeg2_stride");
+  mpeg2_reset_ptr = dlsym(dll_handle,"mpeg2_reset");
   return mpeg2_init_ptr && mpeg2_close_ptr && mpeg2_info_ptr &&
 	 mpeg2_parse_ptr && mpeg2_buffer_ptr && mpeg2_set_buf_ptr &&
-	 mpeg2_stride_ptr;
+	 mpeg2_stride_ptr && mpeg2_reset_ptr;
 }
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
+    priv_t *priv;
+    priv=sh->context;
+    switch(cmd)
+    {
+	case VDCTRL_RESYNC_STREAM:
+	    /*lib starts looking for the next sequence header.*/
+	    mpeg2_reset(priv->mpeg2dec,1);
+	    return CONTROL_TRUE;
+	default: break;
+    }
     return CONTROL_UNKNOWN;
 }
 
@@ -155,6 +168,9 @@ static mp_image_t* decode(sh_video_t *sh
 	    case STATE_INVALID:
 		/* we must call draw_frame() only after STATE_BUFFER and STATE_PICTURE events */
 		MSG_DBG2("display=%X discard=%X current=%X mpi=%X\n",info->display_fbuf,info->discard_fbuf,info->current_fbuf,mpi);
+		/* Workaround for broken (badly demuxed) streams.
+		Reset libmpeg2 to start decoding at the next picture. */
+		if(state==STATE_END) mpeg2_reset(priv->mpeg2dec,0);
 		if (info->display_fbuf && mpi)
 		{
 		    mpi->pict_type=info->current_picture->flags&PIC_MASK_CODING_TYPE;

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17259/libmpcodecs

Modified Files:
	vd.c 
Log Message:
palette related fixes

Index: vd.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -p -u -d -r1.27 -r1.28
--- vd.c	2 Nov 2004 16:36:46 -0000	1.27
+++ vd.c	19 Nov 2004 07:44:04 -0000	1.28
@@ -124,7 +124,7 @@ csp_again:
     }
     if(j<0){
 	// TODO: no match - we should use conversion...
-	if(strcmp(vf->info->name,"fmtcvt") && palette!=-1){
+	if(strcmp(vf->info->name,"fmtcvt") && palette!=1){
 	    MSG_INFO("Can't find colorspace\n");
 	    sc=vf=vf_open_filter(vf,sh,"fmtcvt",NULL);
 	    goto csp_again;

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17259/postproc

Modified Files:
	rgb2rgb.c vf_palette.c 
Log Message:
palette related fixes

Index: rgb2rgb.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/rgb2rgb.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -p -u -d -r1.15 -r1.16
--- rgb2rgb.c	19 Oct 2004 06:40:01 -0000	1.15
+++ rgb2rgb.c	19 Nov 2004 07:44:04 -0000	1.16
@@ -400,13 +400,25 @@ void palette8torgb16(const uint8_t *src,
 {
 	unsigned i;
 	for(i=0; i<num_pixels; i++)
-		((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
+	{
+	    unsigned char r,g,b;
+	    b=palette[src[i]*4+0];
+	    g=palette[src[i]*4+1];
+	    r=palette[src[i]*4+2];
+	    ((uint16_t *)dst)[i]=((b&0xF8)<<8)+((g&0xFC)<<3)+(r>>3);
+	}
 }
 void palette8tobgr16(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
 {
 	unsigned i;
 	for(i=0; i<num_pixels; i++)
-		((uint16_t *)dst)[i] = bswap_16(((uint16_t *)palette)[ src[i] ]);
+	{
+	    unsigned char r,g,b;
+	    r=palette[src[i]*4+0];
+	    g=palette[src[i]*4+1];
+	    b=palette[src[i]*4+2];
+	    ((uint16_t *)dst)[i]=((b&0xF8)<<8)+((g&0xFC)<<3)+(r>>3);
+	}
 }
 
 /**
@@ -416,13 +428,25 @@ void palette8torgb15(const uint8_t *src,
 {
 	unsigned i;
 	for(i=0; i<num_pixels; i++)
-		((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
+	{
+	    unsigned char r,g,b;
+	    b=palette[src[i]*4+0];
+	    g=palette[src[i]*4+1];
+	    r=palette[src[i]*4+2];
+	    ((uint16_t *)dst)[i]=((b&0xF8)<<7)+((g&0xF8)<<2)+(r>>3);
+	}
 }
 void palette8tobgr15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
 {
 	unsigned i;
 	for(i=0; i<num_pixels; i++)
-		((uint16_t *)dst)[i] = bswap_16(((uint16_t *)palette)[ src[i] ]);
+	{
+	    unsigned char r,g,b;
+	    r=palette[src[i]*4+0];
+	    g=palette[src[i]*4+1];
+	    b=palette[src[i]*4+2];
+	    ((uint16_t *)dst)[i]=((b&0xF8)<<7)+((g&0xF8)<<2)+(r>>3);
+	}
 }
 
 void rgb32tobgr24(const uint8_t *src, uint8_t *dst, unsigned int src_size)

Index: vf_palette.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/vf_palette.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -p -u -d -r1.6 -r1.7
--- vf_palette.c	2 Nov 2004 16:36:46 -0000	1.6
+++ vf_palette.c	19 Nov 2004 07:44:04 -0000	1.7
@@ -19,17 +19,17 @@
 // depth as the output, which is incorrect. --Joey
 
 static unsigned int bgr_list[]={
-    IMGFMT_BGR32,
+    IMGFMT_BGR15,
+    IMGFMT_BGR16,
     IMGFMT_BGR24,
-//    IMGFMT_BGR16,
-//    IMGFMT_BGR15,
+    IMGFMT_BGR32,
     0
 };
 static unsigned int rgb_list[]={
-    IMGFMT_RGB32,
+    IMGFMT_RGB15,
+    IMGFMT_RGB16,
     IMGFMT_RGB24,
-//    IMGFMT_RGB16,
-//    IMGFMT_RGB15,
+    IMGFMT_RGB32,
     0
 };
 
@@ -43,7 +43,7 @@ static unsigned int find_best(struct vf_
     else if(fmt==IMGFMT_RGB8) p=rgb_list;
     else return 0;
     while(*p){
-	ret=vf_next_query_format(vf->next,*p,w,h);
+	ret=vf->next->query_format(vf->next,*p,w,h);
 	MSG_DBG2("[%s] query(%s) -> %d\n",vf->info->name,vo_format_name(*p),ret&3);
 	if(ret&VFCAP_CSP_SUPPORTED_BY_HW){ best=*p; break;} // no conversion -> bingo!
 	if(ret&VFCAP_CSP_SUPPORTED && !best) best=*p; // best with conversion

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16792

Modified Files:
	demux_mov.c 
Log Message:
still one segfault --

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_mov.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -p -u -d -r1.22 -r1.23
--- demux_mov.c	17 Nov 2004 09:01:31 -0000	1.22
+++ demux_mov.c	19 Nov 2004 07:41:41 -0000	1.23
@@ -1493,6 +1493,7 @@ static void lschunks(demuxer_t* demuxer,
 		    {
 			if( udta_len>udta_size)
 				udta_len=udta_size;
+			if(udta_len<8) udta_len=8;
 			{
 			char dump[udta_len-4];
 			stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);

Update of /cvsroot/mplayerxp/mplayerxp/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14718

Modified Files:
	codecs.conf 
Log Message:
partial sync with mphq

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/etc/codecs.conf,v
retrieving revision 1.45
retrieving revision 1.46
diff -p -u -d -r1.45 -r1.46
--- codecs.conf	4 Nov 2004 17:14:57 -0000	1.45
+++ codecs.conf	18 Nov 2004 09:27:34 -0000	1.46
@@ -824,33 +824,12 @@ videocodec vcr2
   out BGR24
   cpuflags mmx
 
-videocodec wmv7
-  info "Windows Media Video 7"
-  status working
-  fourcc WMV1
-  driver dshow
-  dll "wmvds32.ax"
-  guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
-;  out I420,IYUV
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
-
-videocodec wmv8
-  info "Windows Media Video 8"
-  status working
-  fourcc WMV2
-  driver dshow
-  dll "wmv8ds32.ax"
-  guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
-
+; ======= DMO Video codecs =============
 videocodec wmv9dmo
   info "Windows Media Video 9 DMO"
   status working
   fourcc WMV3
+  fourcc WMVP
   driver dmo
   dll "wmv9dmod.dll"
   guid 0x724bb6a4, 0xe526, 0x450f, 0xaf, 0xfa, 0xab, 0x9b, 0x45, 0x12, 0x91, 0x11
@@ -864,6 +843,7 @@ videocodec wmvdmo
   fourcc WMV1
   fourcc WMV2
   fourcc WMV3
+  fourcc WMVP
   driver dmo
   dll "wmvdmod.dll"
   guid 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34
@@ -871,6 +851,49 @@ videocodec wmvdmo
   out YUY2,UYVY
   out BGR32,BGR24,BGR16 ;,BGR15
 
+videocodec 3ivX
+  info "3ivX Delta 3.5"
+  status crashing
+  fourcc 3IV1
+  driver dshow
+  dll "3ivxdmo.dll"
+  guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
+  out YV12
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
+videocodec wmsdmod
+  info "Windows Media Screen Codec 2"
+  status working
+  fourcc MSS2
+  driver dmo
+  dll "wmsdmod.dll"
+  guid 0x7bafb3b1, 0xd8f4, 0x4279, 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde
+  out BGR32,BGR24,BGR16
+
+videocodec wmv7
+  info "Windows Media Video 7"
+  status working
+  fourcc WMV1
+  driver dshow
+  dll "wmvds32.ax"
+  guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
+;  out I420,IYUV
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+  cpuflags mmx
+
+videocodec wmv8
+  info "Windows Media Video 8"
+  status working
+  fourcc WMV2
+  driver dshow
+  dll "wmv8ds32.ax"
+  guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+  cpuflags mmx
+
 videocodec tm20
   info "TrueMotion 2.0"
   status crashing
@@ -886,8 +909,10 @@ videocodec tm20
 videocodec qdv
   info "Sony Digital Video (DV)"
   status working
-  fourcc DVSD,dvsd,dvcp dvsd
-  fourcc "dvc " dvsd
+  fourcc dvsl,dvsd,dvhd  ; ????
+  fourcc DVSD dvsd   ; pal .avi
+  fourcc "dvcp" dvsd ; pal .mov
+  fourcc "dvc " dvsd ; ntsc .mov
   driver dshow
   dll "qdv.dll"
   guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42
@@ -899,8 +924,11 @@ videocodec qdv
 videocodec mcdv
   info "MainConcept DV Codec"
   status working
-  fourcc DVSD,dvsd,dvcp dvsd		# dvcp stands for PAL DV in mov
-  fourcc "dvc " dvsd
+  fourcc DVSD,dvsd   ; PAL
+  fourcc DVCS,dvcs   ; NTSC ?
+  fourcc CDVC,cdvc   ; ???
+  fourcc "dvcp" dvsd ; PAL DV in .mov
+  fourcc "dvc " dvcs ; NTSC DV in .mov
   driver vfw
   dll "mcdvd_32.dll"
   out YUY2
@@ -1029,17 +1057,6 @@ videocodec asv1
   out BGR32,BGR24,BGR15 flip
   cpuflags mmx
 
-videocodec 3ivX
-  info "3ivX Delta 3.5"
-  status crashing
-  fourcc 3IV1
-  driver dshow
-  dll "3ivxdmo.dll"
-  guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
-  out YV12
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
 videocodec mss1
   info "Windows Screen Video"
   status working
@@ -1153,6 +1170,124 @@ videocodec CJPG
   out UYVY
   out BGR24,BGR15
 
+videocodec imagepower
+  info "ImagePower MJPEG2000"
+  status buggy
+  fourcc IPJ2
+  driver vfw
+  dll "jp2avi.dll"
+  out BGR32,BGR24,BGR15
+
+videocodec m3jpeg2k
+  info "Morgan MJPEG2000"
+  status working
+  fourcc MJ2C
+  driver vfw
+  dll "m3jp2k32.dll"
+  out YV12,I420,IYUV
+  out YUY2,UYVY
+  out BGR32,BGR24,BGR15
+
+; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm
+videocodec m3jpegds
+  info "Morgan MJPEG"
+  status crashing
+  fourcc MJPG mjpg
+  fourcc mjpa,mjpb,mjpg mjpg  ; MOV files
+  fourcc dmb1 mjpg            ; MJPEG by Matrox Rainbow Runner
+  driver dshow
+  dll "m3jpegdec.ax"
+  guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
+  out I420
+  out YUY2,UYVY
+  out BGR32,BGR24,BGR16,BGR15
+
+videocodec vp4
+  info "On2 VP4 Personal Codec"
+  comment "Decodes also VP3"
+  status working
+  fourcc VP40
+  fourcc VP31,VP30,vp31,vp30
+  driver vfwex
+  dll "vp4vfw.dll"
+  out YUY2
+  out BGR32,BGR24
+
+videocodec vp5
+  info "On2 VP5 Personal Codec"
+  status working
+  fourcc VP50
+  driver vfwex
+  dll "vp5vfw.dll"
+  out YUY2
+  out BGR32,BGR24
+
+videocodec vp6
+  info "On2 VP6 Personal Codec"
+  status working
+  fourcc VP60,VP61,VP62
+  driver vfwex
+  dll "vp6vfw.dll"
+  out YUY2
+  out BGR32,BGR24
+
+videocodec vivd2
+  info "SoftMedia ViVD V2 codec Vfw"
+  status working
+  fourcc GXVE,gxve
+  driver vfw
+  dll "ViVD2.dll"
+  out YUY2,YV12,I420,YVU9
+  out BGR32,BGR24,BGR15
+
+videocodec winx
+  info "Winnov Videum winx codec"
+  status working
+  fourcc WINX
+  driver vfwex
+  dll "wnvwinx.dll"
+  out BGR32,BGR24,BGR15
+
+videocodec wnv1
+  info "Winnov Videum wnv1 codec"
+  status working
+  fourcc WNV1
+  driver vfwex
+  dll "wnvplay1.dll"
+  out BGR32,BGR24,BGR15
+
+videocodec vdom
+  info "VDOWave codec"
+  status working
+  fourcc VDOM
+  driver vfw
+  dll "vdowave.drv" ; Need also VDODEC32.dll and DECVW_32.DLL
+  out BGR24
+
+videocodec vsslight
+  info "VSS Codec Light"
+  status working
+  fourcc VSSV
+  driver vfw
+  dll "vsslight.dll"
+  out BGR24 flip
+
+videocodec vssh264
+  info "VSS H.264"
+  status working
+  fourcc VSSH
+  driver vfw
+  dll "vssh264.dll" ; need also vssh264core.dll, vssh264dec.dll
+  out BGR24 flip
+
+videocodec vsswlt
+  info "VSS Wavelet Video Codec"
+  status working
+  fourcc VSSW
+  driver vfw
+  dll "vsswlt.dll"
+  out BGR24 flip
+
 ; =============== XANIM DLL's =============
 
 videocodec indeo5xa
@@ -1319,6 +1454,14 @@ videocodec qtsvq1
   dll "QuickTime.qts"
   out YVU9
 
+videocodec qtavui
+  info "win32/quicktime Avid Meridien Uncompressed"
+  status working
+  fourcc AVUI
+  driver qtvideo
+  dll "AvidQTAVUICodec.qtx"
+  out YUY2
+
 videocodec theora
   info "Theora (free, reworked VP3)"
   status working
@@ -1492,6 +1635,24 @@ videocodec rawbgr8
   format 0x20776172
   format 0x42475208
   out BGR8
+  
+videocodec alpary
+  info "Alparysoft lossless codec dshow"
+  status working
+  fourcc ASLC
+  driver dshow
+  dll "aslcodec_dshow.dll"
+  guid 0x7f9de066, 0xbf3d, 0x4c17, 0x86, 0xb7, 0x33, 0xe4, 0x3e, 0xbe, 0xae, 0xf0
+  out BGR24 flip
+
+videocodec LEADMW20
+  info "Lead CMW wavelet 2.0"
+  status working
+  fourcc LCW2
+  driver dshow
+  dll "LCODCCMW2E.dll"; eval need also LCMW2.dll
+  guid 0xe2b7dc56, 0x38c5, 0x11d5, 0x91, 0xf6, 0x00, 0x10, 0x4b, 0xdb, 0x8f, 0xf9
+  out BGR24,BGR8 flip
 
 videocodec null
   info "NULL codec (no decoding!)"
@@ -1729,6 +1890,13 @@ audiocodec ffdk3adpcm
   driver ffmpeg
   dll adpcm_ima_dk4
 
+audiocodec ffctadp32
+  info "Creative ADPCM native codec"
+  status working
+  format 0x200
+  driver ffmpeg
+  dll "adpcm_ct"
+
 audiocodec divx
   info "DivX audio (WMA)"
   status working
@@ -1758,6 +1926,14 @@ audiocodec wmadmo
   dll "wmadmod.dll"
   guid 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a
 
+audiocodec wma9spdmo
+  info "Windows Media Audio 9 Speech DMO"
+  status working
+  format 0xa
+  driver dmo
+  dll "wmspdmod.dll"
+  guid 0x874131cb, 0x4ecc, 0x443b, 0x89, 0x48, 0x74, 0x6b, 0x89, 0x59, 0x5d, 0x20
+
 audiocodec mp3acm
   info "MPEG layer-3"
   status working
@@ -1857,12 +2033,25 @@ audiocodec imc
   driver acm
   dll "imc32.acm"
 
+audiocodec iac25
+  info "Indeo audio"
+  status working
+  format 0x402
+  driver acm
+  dll "iac25_32.ax"
+
 audiocodec hwac3
   info "AC3 through SPDIF"
   status working
   format 0x2000
+  format 0x74656E64 ; dnet
+  driver hwac3
+
+audiocodec hwdts
+  info "DTS through SPDIF"
+  status working
+  format 0x2001
   driver hwac3
-  dll "ac3-iec958.c"
 
 audiocodec vorbis
   info "OggVorbis Audio Decoder"
@@ -1934,6 +2123,13 @@ audiocodec truespeech
   driver acm
   dll "tssoft32.acm"
 
+audiocodec sc4
+  info "SC4 : Micronas speech codec (ADPCM, MPman recording)"
+  status working
+  format 0x350
+  driver acm
+  dll "mi-sc4.acm"
+
 ; =========== QT AUDIO =========
 audiocodec qdmc
   info "Quicktime QDMC/QDM2 audio decoders"

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14391

Modified Files:
	demux_ogg.c 
Log Message:
to not load unneccesary dlls - detect stream by fourcc

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_ogg.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -p -u -d -r1.16 -r1.17
--- demux_ogg.c	23 Oct 2004 15:10:16 -0000	1.16
+++ demux_ogg.c	18 Nov 2004 09:26:15 -0000	1.17
@@ -264,9 +264,12 @@ static int load_ogg_lib( void )
 
 static int ogg_probe(demuxer_t *demuxer)
 {
-  if(!load_ogg_lib()) return 0;
-  demuxer->file_format=DEMUXER_TYPE_OGG;
-  return 1; /* FIXME */
+    uint32_t fcc;
+    fcc=me2be_32(stream_read_dword(demuxer->stream));
+    if(fcc != mmioFOURCC('O','g','g','S')) return 0;
+    demuxer->file_format=DEMUXER_TYPE_OGG;
+    stream_seek(demuxer->stream,0);
+    return 1;
 }
 
 
@@ -813,6 +816,7 @@ static demuxer_t * ogg_open(demuxer_t* d
   sh_audio_t* sh_a;
   sh_video_t* sh_v;
 
+  if(!load_ogg_lib()) return 0;
 #if 0
   subcp_open(NULL);
 #endif

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13916

Modified Files:
	dec_video.c vd_divx4.c vd_dmo.c vd_dshow.c vd_huffyuv.c 
	vd_mpegpes.c vd_nuv.c vd_qtvideo.c vd_raw.c vd_real.c 
	vd_theora.c vd_vfw.c vd_xvid.c 
Log Message:
mark image as already rendered to except double painting

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/dec_video.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -p -u -d -r1.26 -r1.27
--- dec_video.c	11 Nov 2004 17:31:45 -0000	1.26
+++ dec_video.c	18 Nov 2004 09:23:50 -0000	1.27
@@ -235,7 +235,7 @@ int init_video(sh_video_t *sh_video,cons
 		case IMGFMT_BGR32: bpp = 32; break;
 	}
 	o_bps=sh_video->fps*sh_video->disp_w*sh_video->disp_h*bpp/8;
-	MSG_OK("[VC] %s decoder: [%s] drv:%s.%s (%dx%d (aspect %f) %4.2ffps ratio %i->%i\n"
+	MSG_OK("[VC] %s decoder: [%s] drv:%s.%s (%dx%d (aspect %g) %4.2ffps ratio %i->%i\n"
 	,video_codec?"Forcing":"Selected"
 	,sh_video->codec->codec_name
 	,mpvdec->info->driver_name
@@ -244,7 +244,8 @@ int init_video(sh_video_t *sh_video,cons
 	,sh_video->disp_h
 	,sh_video->aspect
 	,sh_video->fps
-	,sh_video->i_bps,o_bps);
+	,sh_video->i_bps
+	,o_bps);
 	// Yeah! We got it!
 	sh_video->inited=1;
 	return 1;

Index: vd_divx4.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_divx4.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -p -u -d -r1.12 -r1.13
--- vd_divx4.c	2 Nov 2004 16:36:46 -0000	1.12
+++ vd_divx4.c	18 Nov 2004 09:23:53 -0000	1.13
@@ -193,7 +193,7 @@ static mp_image_t* decode(sh_video_t *sh
 
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_PRESERVE | MP_IMGFLAG_ACCEPT_WIDTH,
 	0,0,sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     dec_frame.bmp=mpi->planes[0];
     dec_frame.stride=(mpi->flags&(MP_IMGFLAG_YUV|MP_IMGFLAG_DIRECT))==(MP_IMGFLAG_YUV|MP_IMGFLAG_DIRECT)?

Index: vd_dmo.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_dmo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- vd_dmo.c	2 Nov 2004 16:36:46 -0000	1.3
+++ vd_dmo.c	18 Nov 2004 09:23:53 -0000	1.4
@@ -100,6 +100,7 @@ static mp_image_t* decode(sh_video_t *sh
     
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/, 
 	0,0,sh->disp_w, sh->disp_h);
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
     
     if(!mpi){	// temporary!
 	MSG_ERR("couldn't allocate image for cinepak codec\n");

Index: vd_dshow.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_dshow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -u -d -r1.5 -r1.6
--- vd_dshow.c	2 Nov 2004 16:36:46 -0000	1.5
+++ vd_dshow.c	18 Nov 2004 09:23:53 -0000	1.6
@@ -126,11 +126,7 @@ static mp_image_t* decode(sh_video_t *sh
     
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/, 
 	0,0,sh->disp_w, sh->disp_h);
-    
-    if(!mpi){	// temporary!
-	MSG_ERR("couldn't allocate image for dshow codec\n");
-	return NULL;
-    }
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     (*DS_VideoDecoder_DecodeInternal_ptr)(sh->context, data, len, 0, mpi->planes[0]);
 

Index: vd_huffyuv.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_huffyuv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -d -r1.4 -r1.5
--- vd_huffyuv.c	2 Nov 2004 16:36:46 -0000	1.4
+++ vd_huffyuv.c	18 Nov 2004 09:23:53 -0000	1.5
@@ -526,11 +526,7 @@ static mp_image_t* decode(sh_video_t *sh
 		mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, 0,0,sh->disp_w, sh->disp_h);
 	else
 		mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0, 0,0,sh->disp_w, sh->disp_h);
-
-	if (!mpi) {
-		MSG_ERR( "Can't allocate mpi image for huffyuv codec.\n");
-		return NULL;
-	}
+	if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
 	outptr = mpi->planes[0]; // Output image pointer
 

Index: vd_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_mpegpes.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -u -d -r1.5 -r1.6
--- vd_mpegpes.c	2 Nov 2004 16:36:46 -0000	1.5
+++ vd_mpegpes.c	18 Nov 2004 09:23:53 -0000	1.6
@@ -35,6 +35,7 @@ static mp_image_t* decode(sh_video_t *sh
     mp_image_t* mpi;
     static vo_mpegpes_t packet;
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, 0,0,sh->disp_w, sh->disp_h);
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
     packet.data=data;
     packet.size=len-4;
     packet.timestamp=sh->timer*90000.0;

Index: vd_nuv.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_nuv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -p -u -d -r1.6 -r1.7
--- vd_nuv.c	2 Nov 2004 16:36:46 -0000	1.6
+++ vd_nuv.c	18 Nov 2004 09:23:53 -0000	1.7
@@ -55,7 +55,7 @@ static mp_image_t* decode(sh_video_t *sh
     
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0, 
 	0,0,sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     decode_nuv(data, len, mpi->planes[0], sh->disp_w, sh->disp_h);
 

Index: vd_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_qtvideo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -d -r1.4 -r1.5
--- vd_qtvideo.c	2 Nov 2004 16:36:46 -0000	1.4
+++ vd_qtvideo.c	18 Nov 2004 09:23:53 -0000	1.5
@@ -314,7 +314,7 @@ static mp_image_t* decode(sh_video_t *sh
 
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE, 
 	0,0,sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     decpar.data = (char*)data;
     decpar.bufferSize = len;

Index: vd_raw.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_raw.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -p -u -d -r1.12 -r1.13
--- vd_raw.c	2 Nov 2004 16:36:46 -0000	1.12
+++ vd_raw.c	18 Nov 2004 09:23:53 -0000	1.13
@@ -48,7 +48,7 @@ static mp_image_t* decode(sh_video_t *sh
     
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, 
 	0,0,sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     if(mpi->flags&MP_IMGFLAG_PLANAR){
 	mpi->planes[0]=data;

Index: vd_real.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_real.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -u -d -r1.5 -r1.6
--- vd_real.c	2 Nov 2004 16:36:46 -0000	1.5
+++ vd_real.c	18 Nov 2004 09:23:53 -0000	1.6
@@ -67,7 +67,8 @@ void __builtin_vec_delete(void *mem) {
 	free(mem);
 }
 
-void __pure_virtual(void) {
+void __pure_virtual(void)
+{
 	MSG_ERR( "I'm outa here!\n");
 	exit(1);
 }
@@ -201,7 +202,7 @@ static mp_image_t* decode(sh_video_t *sh
 
 	mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
 		0,0,sh->disp_w, sh->disp_h);
-	if(!mpi) return NULL;
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 	
 	result=(*rvyuv_transform)(dp_data, mpi->planes[0], &transform_in,
 		transform_out, sh->context);

Index: vd_theora.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_theora.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -d -r1.4 -r1.5
--- vd_theora.c	2 Nov 2004 16:36:46 -0000	1.4
+++ vd_theora.c	18 Nov 2004 09:23:53 -0000	1.5
@@ -199,7 +199,6 @@ static mp_image_t* decode(sh_video_t *sh
    }
 
     mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, 0,0,sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
     
     mpi->planes[0]=yuv.y;
     mpi->stride[0]=yuv.y_stride;

Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_vfw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -p -u -d -r1.9 -r1.10
--- vd_vfw.c	2 Nov 2004 16:36:46 -0000	1.9
+++ vd_vfw.c	18 Nov 2004 09:23:53 -0000	1.10
@@ -280,10 +280,7 @@ static mp_image_t* decode(sh_video_t *sh
     mpi=mpcodecs_get_image(sh, 
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_WIDTH, 
 	0,0,sh->disp_w, sh->disp_h);
-    if(!mpi){	// temporary!
-	MSG_ERR("Couldn't allocate image for vfw codec\n");
-	return NULL;
-    }
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     // set stride:  (trick discovered by Andreas Ackermann - thanx!)
     sh->bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8);

Index: vd_xvid.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_xvid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -u -d -r1.5 -r1.6
--- vd_xvid.c	2 Nov 2004 16:36:46 -0000	1.5
+++ vd_xvid.c	18 Nov 2004 09:23:53 -0000	1.6
@@ -94,7 +94,7 @@ static mp_image_t* decode(sh_video_t *sh
 
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_PRESERVE | MP_IMGFLAG_ACCEPT_WIDTH,
 	0,0,sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
+    if(mpi->flags&MP_IMGFLAG_DIRECT) mpi->flags|=MP_IMGFLAG_RENDERED;
 
     dec_frame.bmp=mpi->planes[0];
     dec_frame.stride=(mpi->flags&(MP_IMGFLAG_YUV|MP_IMGFLAG_DIRECT))==(MP_IMGFLAG_YUV|MP_IMGFLAG_DIRECT)?

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20398

Modified Files:
	Makefile 
Log Message:
10L. restore work of realcodecs

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -p -u -d -r1.19 -r1.20
--- Makefile	11 Nov 2004 17:50:51 -0000	1.19
+++ Makefile	17 Nov 2004 09:04:52 -0000	1.20
@@ -89,7 +89,7 @@ VIDIX_LIBS += -lvidix
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) -o $(PRG) $(OBJS_MPLAYER) $(VO_LIBS)  $(COMMON_LIBS) $(EXTRA_LIB) $(AO_LIBS) $(V_LIBS) $(VIDIX_LIBS) $(LIRC_LIB) $(STATIC_LIB) -Xlinker --gc-sections --sort-common $(LINKFLAGS)
+	$(CC) -o $(PRG) $(OBJS_MPLAYER) $(VO_LIBS)  $(COMMON_LIBS) $(EXTRA_LIB) $(AO_LIBS) $(V_LIBS) $(VIDIX_LIBS) $(LIRC_LIB) $(STATIC_LIB) -Xlinker --export-dynamic --gc-sections --sort-common $(LINKFLAGS)
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20117

Modified Files:
	af_resample.h af_sub.c af_surround.c dsp_accel.h dsp.c dsp.h 
Log Message:
use mmx optimized resampling and FIR

Index: af_resample.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/af_resample.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -u -d -r1.2 -r1.3
--- af_resample.h	16 Nov 2004 07:30:58 -0000	1.2
+++ af_resample.h	17 Nov 2004 09:03:38 -0000	1.3
@@ -36,9 +36,15 @@
 #if defined(FORMAT_I)
 #define SHIFT >>16
 #define FORMAT int16_t
+#ifdef ARCH_X86
+#define FIR(x,w,y) {y[0]=FIR_i16(x,w);}
+#endif
 #else 
 #define SHIFT
 #define FORMAT float
+#ifdef ARCH_X86
+#define FIR(x,w,y) {y[0]=FIR_f32(x,w);}
+#endif
 #endif
 
 // Short filter
@@ -46,22 +52,24 @@
 
 #define L   	8	// Filter length
 // Unrolled loop to speed up execution 
+#ifndef ARCH_X86
 #define FIR(x,w,y) \
   (y[0])  = ( w[0]*x[0]+w[1]*x[1]+w[2]*x[2]+w[3]*x[3] \
             + w[4]*x[4]+w[5]*x[5]+w[6]*x[6]+w[7]*x[7] ) SHIFT
-
+#endif
 
 
 #else  /* L8/L16 */
 
 #define L   	16
 // Unrolled loop to speed up execution 
+#ifndef ARCH_X86
 #define FIR(x,w,y) \
   y[0] = ( w[0] *x[0] +w[1] *x[1] +w[2] *x[2] +w[3] *x[3] \
          + w[4] *x[4] +w[5] *x[5] +w[6] *x[6] +w[7] *x[7] \
          + w[8] *x[8] +w[9] *x[9] +w[10]*x[10]+w[11]*x[11] \
          + w[12]*x[12]+w[13]*x[13]+w[14]*x[14]+w[15]*x[15] ) SHIFT
-
+#endif
 #endif /* L8/L16 */
 
 // Macro to add data to circular que 

Index: af_sub.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/af_sub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -u -d -r1.1 -r1.2
--- af_sub.c	15 Oct 2004 14:09:57 -0000	1.1
+++ af_sub.c	17 Nov 2004 09:03:39 -0000	1.2
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h> 
+#include <inttypes.h>
 
 #include "af.h"
 #include "dsp.h"

Index: af_surround.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/af_surround.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -u -d -r1.1 -r1.2
--- af_surround.c	15 Oct 2004 14:09:57 -0000	1.1
+++ af_surround.c	17 Nov 2004 09:03:39 -0000	1.2
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include "af.h"
 #include "dsp.h"
@@ -45,15 +46,7 @@
 #define LD 65536 // Length of delay buffer
 
 // 32 Tap fir filter loop unrolled
-#define FIR(x,w,y) \
-  y = ( w[0] *x[0] +w[1] *x[1] +w[2] *x[2] +w[3] *x[3]  \
-      + w[4] *x[4] +w[5] *x[5] +w[6] *x[6] +w[7] *x[7]  \
-      + w[8] *x[8] +w[9] *x[9] +w[10]*x[10]+w[11]*x[11] \
-      + w[12]*x[12]+w[13]*x[13]+w[14]*x[14]+w[15]*x[15] \
-      + w[16]*x[16]+w[17]*x[17]+w[18]*x[18]+w[19]*x[19] \
-      + w[20]*x[20]+w[21]*x[21]+w[22]*x[22]+w[23]*x[23] \
-      + w[24]*x[24]+w[25]*x[25]+w[26]*x[26]+w[27]*x[27] \
-      + w[28]*x[28]+w[29]*x[29]+w[30]*x[30]+w[31]*x[31])
+#define FIR(x,w) FIR_f32(x,w)+FIR_f32(&x[16],&w[16])
 
 // Add to circular queue macro + update index
 #ifdef SPLITREAR
@@ -213,14 +206,14 @@ static af_data_t* play(struct af_instanc
     out[1] = m[2]*in[0] + m[3]*in[1];
 
     // Low-pass output @ 7kHz
-    FIR((&s->lq[i]), s->w, s->dl[wi]);
+    s->dl[wi]=FIR((&s->lq[i]), s->w);
 
     // Delay output by d ms
     out[2] = s->dl[ri];
 
 #ifdef SPLITREAR
     // Low-pass output @ 7kHz
-    FIR((&s->rq[i]), s->w, s->dr[wi]);
+    s->dr[wi]=FIR((&s->rq[i]), s->w);
 
     // Delay output by d ms
     out[3] = s->dr[ri];

Index: dsp_accel.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/dsp_accel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- dsp_accel.h	16 Oct 2004 12:37:00 -0000	1.3
+++ dsp_accel.h	17 Nov 2004 09:03:39 -0000	1.4
@@ -356,7 +356,8 @@ static void RENAME(int2float)(void* in, 
 		"movq  %%mm4, 32(%0)\n\t"
 		"movq  %%mm5, 40(%0)\n\t"
 		"movq  %%mm6, 48(%0)\n\t"
-		"movq  %%mm7, 56(%0)"
+		"movq  %%mm7, 56(%0)\n\t"
+		"femms"
 		::"g"(&(((float*)out)[i])),"g"(&(((int16_t*)in)[i])),"m"(tmp_f32[0]):"memory");
     }
 #endif
@@ -409,7 +410,8 @@ static void RENAME(int2float)(void* in, 
 		"movq  %%mm4, 32(%0)\n\t"
 		"movq  %%mm5, 40(%0)\n\t"
 		"movq  %%mm6, 48(%0)\n\t"
-		"movq  %%mm7, 56(%0)"
+		"movq  %%mm7, 56(%0)\n\t"
+		"femms"
 		::"g"(&(((float*)out)[i])),"g"(&(((int32_t*)in)[i])),"m"(tmp_f32[0]):"memory");
     }
 #endif
@@ -417,7 +419,81 @@ static void RENAME(int2float)(void* in, 
       ((float*)out)[i]=(1.0/INT_MAX)*((float)((int32_t*)in)[i]);
     break;
   }	
+}
+
+static int32_t RENAME(FIR_i16)(int16_t *x,int16_t *w)
+{
+#ifdef HAVE_MMX
+    int32_t rval;
+    __asm __volatile(
+	"movq		(%1), %%mm0\n\t"
+	"movq		8(%1), %%mm1\n\t"
+	"movq		16(%1), %%mm2\n\t"
+	"movq		24(%1), %%mm3\n\t"
+	"pmaddwd	(%2), %%mm0\n\t"
+	"pmaddwd	8(%2), %%mm1\n\t"
+	"pmaddwd	16(%2), %%mm2\n\t"
+	"pmaddwd	24(%2), %%mm3\n\t"
+	"paddd		%%mm1, %%mm0\n\t"
+	"paddd		%%mm3, %%mm2\n\t"
+	"paddd		%%mm2, %%mm0\n\t"
+#ifdef HAVE_MMX2
+	"pshufw		$0xFE, %%mm0, %%mm1\n\t"
+#else
+	"movq		%%mm0, %%mm1\n\t"
+	"psrlq		$32, %%mm1\n\t"
+#endif
+	"paddd		%%mm1, %%mm0\n\t"
+	"psrld		$16, %%mm0\n\t"
+	"movd		%%mm0, %0\n\t"
+	"emms"
+	:"=r"(rval):"g"(w),"g"(x):"memory");
+	return rval;
+#else
+  return ( w[0] *x[0] +w[1] *x[1] +w[2] *x[2] +w[3] *x[3]
+         + w[4] *x[4] +w[5] *x[5] +w[6] *x[6] +w[7] *x[7]
+         + w[8] *x[8] +w[9] *x[9] +w[10]*x[10]+w[11]*x[11]
+         + w[12]*x[12]+w[13]*x[13]+w[14]*x[14]+w[15]*x[15] ) >> 16;
+#endif
+}
+
+static float RENAME(FIR_f32)(float *x,float *w)
+{
 #ifdef HAVE_3DNOW
-    asm volatile(EMMS:::"memory");
+    float rval;
+    __asm __volatile(
+	"movq		(%1), %%mm0\n\t"
+	"movq		8(%1), %%mm1\n\t"
+	"movq		16(%1), %%mm2\n\t"
+	"movq		24(%1), %%mm3\n\t"
+	"movq		32(%1), %%mm4\n\t"
+	"movq		40(%1), %%mm5\n\t"
+	"movq		48(%1), %%mm6\n\t"
+	"movq		56(%1), %%mm7\n\t"
+	"pfmul		(%2), %%mm0\n\t"
+	"pfmul		8(%2), %%mm1\n\t"
+	"pfmul		16(%2), %%mm2\n\t"
+	"pfmul		24(%2), %%mm3\n\t"
+	"pfmul		32(%2), %%mm4\n\t"
+	"pfmul		40(%2), %%mm5\n\t"
+	"pfmul		48(%2), %%mm6\n\t"
+	"pfmul		56(%2), %%mm7\n\t"
+	"pfadd		%%mm1, %%mm0\n\t"
+	"pfadd		%%mm3, %%mm2\n\t"
+	"pfadd		%%mm5, %%mm4\n\t"
+	"pfadd		%%mm7, %%mm6\n\t"
+	"pfadd		%%mm2, %%mm0\n\t"
+	"pfadd		%%mm6, %%mm4\n\t"
+	"pfadd		%%mm4, %%mm0\n\t"
+	"pfacc		%%mm0, %%mm0\n\t"
+	"movd		%%mm0, %0\n\t"
+	"femms"
+	:"=r"(rval):"g"(w),"g"(x):"memory");
+	return rval;
+#else
+  return ( w[0] *x[0] +w[1] *x[1] +w[2] *x[2] +w[3] *x[3]
+         + w[4] *x[4] +w[5] *x[5] +w[6] *x[6] +w[7] *x[7]
+         + w[8] *x[8] +w[9] *x[9] +w[10]*x[10]+w[11]*x[11]
+         + w[12]*x[12]+w[13]*x[13]+w[14]*x[14]+w[15]*x[15] );
 #endif
 }

Index: dsp.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/dsp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -d -r1.4 -r1.5
--- dsp.c	21 Oct 2004 06:12:46 -0000	1.4
+++ dsp.c	17 Nov 2004 09:03:39 -0000	1.5
@@ -751,3 +751,30 @@ static void init_int2float(void* in, voi
 	(*int2float)(in,out,len,bps);
 }
 void (*int2float)(void* in, void* out, int len, int bps)=init_int2float;
+
+
+static int32_t FIR_i16_init(int16_t *x,int16_t *w)
+{
+#ifdef CAN_COMPILE_X86_ASM
+	if(gCpuCaps.hasMMX2) FIR_i16 = FIR_i16_MMX2;
+	else
+	if(gCpuCaps.hasMMX) FIR_i16 = FIR_i16_MMX;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	FIR_i16 = FIR_i16_c;
+	return (*FIR_i16)(x,w);
+}
+int32_t (*FIR_i16)(int16_t *x,int16_t *w)=FIR_i16_init;
+
+static float FIR_f32_init(float *x,float *w)
+{
+#ifdef CAN_COMPILE_X86_ASM
+//	if(gCpuCaps.hasSSE) FIR_f32 = FIR_f32_SSE;
+//	else
+	if(gCpuCaps.has3DNow) FIR_f32 = FIR_f32_3DNow;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	FIR_f32 = FIR_f32_c;
+	return (*FIR_f32)(x,w);
+}
+float (*FIR_f32)(float *x,float *w)=FIR_f32_init;

Index: dsp.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/postproc/dsp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- dsp.h	21 Oct 2004 06:12:46 -0000	1.3
+++ dsp.h	17 Nov 2004 09:03:39 -0000	1.4
@@ -145,4 +145,7 @@ static inline float bandpass(bandp_t *_t
 extern void (*change_bps)(const void* in, void* out, unsigned len, unsigned inbps, unsigned outbps);
 extern void (*float2int)(void* in, void* out, int len, int bps);
 extern void (*int2float)(void* in, void* out, int len, int bps);
+extern int32_t (*FIR_i16)(int16_t *x,int16_t *w);
+extern float (*FIR_f32)(float *x,float *w);
+
 #endif

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19639

Modified Files:
	demux_mov.c 
Log Message:
Oops

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demux_mov.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -p -u -d -r1.21 -r1.22
--- demux_mov.c	23 Oct 2004 15:10:15 -0000	1.21
+++ demux_mov.c	17 Nov 2004 09:01:31 -0000	1.22
@@ -279,6 +279,7 @@ typedef struct {
 static int mov_probe(demuxer_t* demuxer){
     int flags=0;
     int no=0;
+    unsigned ver;
     mov_priv_t* priv=malloc(sizeof(mov_priv_t));
     
     MSG_V("Checking for MOV\n");
@@ -362,8 +363,8 @@ static int mov_probe(demuxer_t* demuxer)
 	      tmp = BE_32(tmp);  
 	      MSG_WARN("MOV: File-Type unknown Major-Brand: %.4s\n",&tmp);
 	  }
-	  MSG_V("MOV: File-Type Minor-Version: %d\n",
-	      stream_read_dword(demuxer->stream));
+	  ver=stream_read_dword(demuxer->stream);
+	  MSG_V("MOV: File-Type Minor-Version: %d\n",ver);
 	  skipped += 8;
 	  // List all compatible brands
 	  for(i = 0; i < ((len-16)/4); i++) {

Update of /cvsroot/mplayerxp/mplayerxp/codecs/libfaad2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19110

Modified Files:
	output.c 
Log Message:
use 3DNow,SSE optimized output

Index: output.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/codecs/libfaad2/output.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -u -d -r1.1 -r1.2
--- output.c	7 Oct 2004 17:09:58 -0000	1.1
+++ output.c	17 Nov 2004 09:00:18 -0000	1.2
@@ -32,6 +32,9 @@
 
 #include "output.h"
 #include "decoder.h"
+#include "../mm_accel.h"
+
+extern unsigned faad_cpu_flags;
 
 #ifndef FIXED_POINT
 
@@ -86,207 +89,120 @@ if (sample >= 0.0f)            \
 
 #define CONV(a,b) ((a<<1)|(b&0x1))
 
-static void to_PCM_16bit(faacDecHandle hDecoder, real_t **input,
-                         uint8_t channels, uint16_t frame_len,
-                         int16_t **sample_buffer)
-{
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
+#undef HAVE_MMX
+#undef HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_3DNOWEX
+#undef HAVE_SSE
+#define RENAME(a) a ## _c
+#include "i386/output.h"
 
-            CLIP(inp, 32767.0f, -32768.0f);
+#ifdef ARCH_X86
+#define CAN_COMPILE_X86_ASM
+#endif
 
-            (*sample_buffer)[i] = (int16_t)lrintf(inp);
-        }
-        break;
-    case CONV(2,0):
-        ch  = hDecoder->internal_channel[0];
-        ch1 = hDecoder->internal_channel[1];
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp0 = input[ch ][i];
-            real_t inp1 = input[ch1][i];
+#ifdef CAN_COMPILE_X86_ASM
 
-            CLIP(inp0, 32767.0f, -32768.0f);
-            CLIP(inp1, 32767.0f, -32768.0f);
+//3DNow! versions
+#undef RENAME
+#define HAVE_MMX
+#undef HAVE_MMX2
+#define HAVE_3DNOW
+#define RENAME(a) a ## _3DNow
+#include "i386/output.h"
 
-            (*sample_buffer)[(i*2)+0] = (int16_t)lrintf(inp0);
-            (*sample_buffer)[(i*2)+1] = (int16_t)lrintf(inp1);
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
+//MMX2 versions
+#undef RENAME
+#define HAVE_MMX
+#define HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_3DNOWEX
+#define HAVE_SSE
+#define RENAME(a) a ## _SSE
+#include "i386/output.h"
 
-                CLIP(inp, 32767.0f, -32768.0f);
+#endif // CAN_COMPILE_X86_ASM
 
-                (*sample_buffer)[(i*channels)+ch] = (int16_t)lrintf(inp);
-            }
-        }
-        break;
-    }
+static void (*to_PCM_16bit)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int16_t **sample_buffer);
+static void to_PCM_16bit_init(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int16_t **sample_buffer)
+{
+#ifdef CAN_COMPILE_X86_ASM
+	if(faad_cpu_flags & MM_ACCEL_X86_SSE) to_PCM_16bit = to_PCM_16bit_SSE;
+	else
+	if(faad_cpu_flags & MM_ACCEL_X86_3DNOW) to_PCM_16bit = to_PCM_16bit_3DNow;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	to_PCM_16bit = to_PCM_16bit_c;
+	(*to_PCM_16bit)(hDecoder,input,channels,frame_len,sample_buffer);
 }
+static void (*to_PCM_16bit)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int16_t **sample_buffer)=to_PCM_16bit_init;
 
-static void to_PCM_24bit(faacDecHandle hDecoder, real_t **input,
+static void (*to_PCM_24bit)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int32_t **sample_buffer);
+static void to_PCM_24bit_init(faacDecHandle hDecoder, real_t **input,
                          uint8_t channels, uint16_t frame_len,
                          int32_t **sample_buffer)
 {
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-
-            inp *= 256.0f;
-            CLIP(inp, 8388607.0f, -8388608.0f);
-
-            (*sample_buffer)[i] = (int32_t)lrintf(inp);
-        }
-        break;
-    case CONV(2,0):
-        ch  = hDecoder->internal_channel[0];
-        ch1 = hDecoder->internal_channel[1];
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp0 = input[ch ][i];
-            real_t inp1 = input[ch1][i];
-
-            inp0 *= 256.0f;
-            inp1 *= 256.0f;
-            CLIP(inp0, 8388607.0f, -8388608.0f);
-            CLIP(inp1, 8388607.0f, -8388608.0f);
-
-            (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
-            (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp1);
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-
-                inp *= 256.0f;
-                CLIP(inp, 8388607.0f, -8388608.0f);
-
-                (*sample_buffer)[(i*channels)+ch] = (int32_t)lrintf(inp);
-            }
-        }
-        break;
-    }
+#ifdef CAN_COMPILE_X86_ASM
+	if(faad_cpu_flags & MM_ACCEL_X86_SSE) to_PCM_24bit = to_PCM_24bit_SSE;
+	else
+	if(faad_cpu_flags & MM_ACCEL_X86_3DNOW) to_PCM_24bit = to_PCM_24bit_3DNow;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	to_PCM_24bit = to_PCM_24bit_c;
+	(*to_PCM_24bit)(hDecoder,input,channels,frame_len,sample_buffer);
 }
+static void (*to_PCM_24bit)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int32_t **sample_buffer)=to_PCM_24bit_init;
 
-static void to_PCM_32bit(faacDecHandle hDecoder, real_t **input,
+static void (*to_PCM_32bit)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int32_t **sample_buffer);
+static void to_PCM_32bit_init(faacDecHandle hDecoder, real_t **input,
                          uint8_t channels, uint16_t frame_len,
                          int32_t **sample_buffer)
 {
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-
-            inp *= 65536.0f;
-            CLIP(inp, 2147483647.0f, -2147483648.0f);
-
-            (*sample_buffer)[i] = (int32_t)lrintf(inp);
-        }
-        break;
-    case CONV(2,0):
-        ch  = hDecoder->internal_channel[0];
-        ch1 = hDecoder->internal_channel[1];
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp0 = input[ch ][i];
-            real_t inp1 = input[ch1][i];
-
-            inp0 *= 65536.0f;
-            inp1 *= 65536.0f;
-            CLIP(inp0, 2147483647.0f, -2147483648.0f);
-            CLIP(inp1, 2147483647.0f, -2147483648.0f);
-
-            (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
-            (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp1);
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-
-                inp *= 65536.0f;
-                CLIP(inp, 2147483647.0f, -2147483648.0f);
-
-                (*sample_buffer)[(i*channels)+ch] = (int32_t)lrintf(inp);
-            }
-        }
-        break;
-    }
+#ifdef CAN_COMPILE_X86_ASM
+	if(faad_cpu_flags & MM_ACCEL_X86_SSE) to_PCM_32bit = to_PCM_32bit_SSE;
+	else
+	if(faad_cpu_flags & MM_ACCEL_X86_3DNOW) to_PCM_32bit = to_PCM_32bit_3DNow;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	to_PCM_32bit = to_PCM_32bit_c;
+	(*to_PCM_32bit)(hDecoder,input,channels,frame_len,sample_buffer);
 }
+static void (*to_PCM_32bit)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         int32_t **sample_buffer)=to_PCM_32bit_init;
 
-static void to_PCM_float(faacDecHandle hDecoder, real_t **input,
+static void (*to_PCM_float)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         float32_t **sample_buffer);
+static void to_PCM_float_init(faacDecHandle hDecoder, real_t **input,
                          uint8_t channels, uint16_t frame_len,
                          float32_t **sample_buffer)
 {
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-            (*sample_buffer)[i] = inp*FLOAT_SCALE;
-        }
-        break;
-    case CONV(2,0):
-        ch  = hDecoder->internal_channel[0];
-        ch1 = hDecoder->internal_channel[1];
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp0 = input[ch ][i];
-            real_t inp1 = input[ch1][i];
-            (*sample_buffer)[(i*2)+0] = inp0*FLOAT_SCALE;
-            (*sample_buffer)[(i*2)+1] = inp1*FLOAT_SCALE;
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-                (*sample_buffer)[(i*channels)+ch] = inp*FLOAT_SCALE;
-            }
-        }
-        break;
-    }
+#ifdef CAN_COMPILE_X86_ASM
+	if(faad_cpu_flags & MM_ACCEL_X86_SSE) to_PCM_float = to_PCM_float_SSE;
+	else
+	if(faad_cpu_flags & MM_ACCEL_X86_3DNOW) to_PCM_float = to_PCM_float_3DNow;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	to_PCM_float = to_PCM_float_c;
+	(*to_PCM_float)(hDecoder,input,channels,frame_len,sample_buffer);
 }
+static void (*to_PCM_float)(faacDecHandle hDecoder, real_t **input,
+                         uint8_t channels, uint16_t frame_len,
+                         float32_t **sample_buffer)=to_PCM_float_init;
+
 
 static void to_PCM_double(faacDecHandle hDecoder, real_t **input,
                           uint8_t channels, uint16_t frame_len,

Update of /cvsroot/mplayerxp/mplayerxp/codecs/libfaad2/i386
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19110/i386

Added Files:
	output.h 
Log Message:
use 3DNow,SSE optimized output

--- NEW FILE: output.h ---
static void RENAME(to_PCM_16bit)(faacDecHandle hDecoder, real_t **input,
                         uint8_t channels, uint16_t frame_len,
                         int16_t **sample_buffer)
{
    uint8_t ch, ch1;
    uint16_t i;

    switch (CONV(channels,hDecoder->downMatrix))
    {
    case CONV(1,0):
    case CONV(1,1):
        for(i = 0; i < frame_len; i++)
        {
            real_t inp = input[hDecoder->internal_channel[0]][i];

            CLIP(inp, 32767.0f, -32768.0f);

            (*sample_buffer)[i] = (int16_t)lrintf(inp);
        }
        break;
    case CONV(2,0):
        ch  = hDecoder->internal_channel[0];
        ch1 = hDecoder->internal_channel[1];
        for(i = 0; i < frame_len; i++)
        {
            real_t inp0 = input[ch ][i];
            real_t inp1 = input[ch1][i];

            CLIP(inp0, 32767.0f, -32768.0f);
            CLIP(inp1, 32767.0f, -32768.0f);

            (*sample_buffer)[(i*2)+0] = (int16_t)lrintf(inp0);
            (*sample_buffer)[(i*2)+1] = (int16_t)lrintf(inp1);
        }
        break;
    default:
        for (ch = 0; ch < channels; ch++)
        {
            for(i = 0; i < frame_len; i++)
            {
                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);

                CLIP(inp, 32767.0f, -32768.0f);

                (*sample_buffer)[(i*channels)+ch] = (int16_t)lrintf(inp);
            }
        }
        break;
    }
}

static void RENAME(to_PCM_24bit)(faacDecHandle hDecoder, real_t **input,
                         uint8_t channels, uint16_t frame_len,
                         int32_t **sample_buffer)
{
    uint8_t ch, ch1;
    uint16_t i;

    switch (CONV(channels,hDecoder->downMatrix))
    {
    case CONV(1,0):
    case CONV(1,1):
        for(i = 0; i < frame_len; i++)
        {
            real_t inp = input[hDecoder->internal_channel[0]][i];

            inp *= 256.0f;
            CLIP(inp, 8388607.0f, -8388608.0f);

            (*sample_buffer)[i] = (int32_t)lrintf(inp);
        }
        break;
    case CONV(2,0):
        ch  = hDecoder->internal_channel[0];
        ch1 = hDecoder->internal_channel[1];
        for(i = 0; i < frame_len; i++)
        {
            real_t inp0 = input[ch ][i];
            real_t inp1 = input[ch1][i];

            inp0 *= 256.0f;
            inp1 *= 256.0f;
            CLIP(inp0, 8388607.0f, -8388608.0f);
            CLIP(inp1, 8388607.0f, -8388608.0f);

            (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
            (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp1);
        }
        break;
    default:
        for (ch = 0; ch < channels; ch++)
        {
            for(i = 0; i < frame_len; i++)
            {
                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);

                inp *= 256.0f;
                CLIP(inp, 8388607.0f, -8388608.0f);

                (*sample_buffer)[(i*channels)+ch] = (int32_t)lrintf(inp);
            }
        }
        break;
    }
}

static void RENAME(to_PCM_32bit)(faacDecHandle hDecoder, real_t **input,
                         uint8_t channels, uint16_t frame_len,
                         int32_t **sample_buffer)
{
    uint8_t ch, ch1;
    uint16_t i;

    switch (CONV(channels,hDecoder->downMatrix))
    {
    case CONV(1,0):
    case CONV(1,1):
        for(i = 0; i < frame_len; i++)
        {
            real_t inp = input[hDecoder->internal_channel[0]][i];

            inp *= 65536.0f;
            CLIP(inp, 2147483647.0f, -2147483648.0f);

            (*sample_buffer)[i] = (int32_t)lrintf(inp);
        }
        break;
    case CONV(2,0):
        ch  = hDecoder->internal_channel[0];
        ch1 = hDecoder->internal_channel[1];
        for(i = 0; i < frame_len; i++)
        {
            real_t inp0 = input[ch ][i];
            real_t inp1 = input[ch1][i];

            inp0 *= 65536.0f;
            inp1 *= 65536.0f;
            CLIP(inp0, 2147483647.0f, -2147483648.0f);
            CLIP(inp1, 2147483647.0f, -2147483648.0f);

            (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
            (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp1);
        }
        break;
    default:
        for (ch = 0; ch < channels; ch++)
        {
            for(i = 0; i < frame_len; i++)
            {
                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);

                inp *= 65536.0f;
                CLIP(inp, 2147483647.0f, -2147483648.0f);

                (*sample_buffer)[(i*channels)+ch] = (int32_t)lrintf(inp);
            }
        }
        break;
    }
}

static void RENAME(to_PCM_float)(faacDecHandle hDecoder, real_t **input,
                         uint8_t channels, uint16_t frame_len,
                         float32_t **sample_buffer)
{
    uint8_t ch, ch1;
    uint16_t i;
#ifdef HAVE_SSE
	unsigned flen;
	float fscale = FLOAT_SCALE;
#elif defined( HAVE_3DNOW )
	unsigned flen;
	float __attribute__((aligned(16))) fscale[2] = { FLOAT_SCALE, FLOAT_SCALE };
#endif

    switch (CONV(channels,hDecoder->downMatrix))
    {
    case CONV(1,0):
    case CONV(1,1):
        for(i = 0; i < frame_len; i++)
        {
            real_t inp = input[hDecoder->internal_channel[0]][i];
            (*sample_buffer)[i] = inp*FLOAT_SCALE;
        }
        break;
    case CONV(2,0):
        ch  = hDecoder->internal_channel[0];
        ch1 = hDecoder->internal_channel[1];
	i=0;
#ifdef HAVE_SSE
	flen=frame_len&(~7);
	__asm __volatile(
	"movss %0, %%xmm7\n\t"
	"shufps $0, %%xmm7, %%xmm7\n\t" /* spread */
	::"m"(fscale):"memory");
        for(; i < flen; i+=8)
        {
	    __asm __volatile(
		"movups	(%1), %%xmm0\n\t"
		"movups	16(%1), %%xmm2\n\t"
		"movups	(%2), %%xmm4\n\t"
		"movups	16(%2), %%xmm5\n\t"
		"movaps	%%xmm0, %%xmm1\n\t"
		"movaps	%%xmm2, %%xmm3\n\t"
		"unpcklps %%xmm4, %%xmm0\n\t"
		"unpckhps %%xmm4, %%xmm1\n\t"
		"unpcklps %%xmm5, %%xmm2\n\t"
		"unpckhps %%xmm5, %%xmm3\n\t"
		"mulps	%%xmm7, %%xmm0\n\t"
		"mulps	%%xmm7, %%xmm1\n\t"
		"mulps	%%xmm7, %%xmm2\n\t"
		"mulps	%%xmm7, %%xmm3\n\t"
		"movups	%%xmm0, (%0)\n\t"
		"movups	%%xmm1, 16(%0)\n\t"
		"movups	%%xmm2, 32(%0)\n\t"
		"movups	%%xmm3, 48(%0)\n\t"
	    ::"g"(&(*sample_buffer)[(i*2)]),"g"(&input[ch][i]),"g"(&input[ch1][i]):"memory");
        }
#elif defined ( HAVE_3DNOW )
	flen=frame_len&(~7);
        for(; i < flen; i+=8)
        {
	    __asm __volatile(
		"movq	(%1), %%mm0\n\t"
		"movq	8(%1), %%mm2\n\t"
		"movq	16(%1), %%mm4\n\t"
		"movq	24(%1), %%mm6\n\t"
		"movq	%%mm0, %%mm1\n\t"
		"movq	%%mm2, %%mm3\n\t"
		"movq	%%mm4, %%mm5\n\t"
		"movq	%%mm6, %%mm7\n\t"
		"punpckldq (%2), %%mm0\n\t"
		"punpckhdq (%2), %%mm1\n\t"
		"punpckldq 8(%2), %%mm2\n\t"
		"punpckhdq 8(%2), %%mm3\n\t"
		"punpckldq 16(%2), %%mm4\n\t"
		"punpckhdq 16(%2), %%mm5\n\t"
		"punpckldq 24(%2), %%mm6\n\t"
		"punpckhdq 24(%2), %%mm7\n\t"
		"pfmul	%3, %%mm0\n\t"
		"pfmul	%3, %%mm1\n\t"
		"pfmul	%3, %%mm2\n\t"
		"pfmul	%3, %%mm3\n\t"
		"pfmul	%3, %%mm4\n\t"
		"pfmul	%3, %%mm5\n\t"
		"pfmul	%3, %%mm6\n\t"
		"pfmul	%3, %%mm7\n\t"
		"movq	%%mm0, (%0)\n\t"
		"movq	%%mm1, 8(%0)\n\t"
		"movq	%%mm2, 16(%0)\n\t"
		"movq	%%mm3, 24(%0)\n\t"
		"movq	%%mm4, 32(%0)\n\t"
		"movq	%%mm5, 40(%0)\n\t"
		"movq	%%mm6, 48(%0)\n\t"
		"movq	%%mm7, 56(%0)\n\t"
	    ::"g"(&(*sample_buffer)[(i*2)]),"g"(&input[ch][i]),"g"(&input[ch1][i]),"m"(fscale[0]):"memory");
        }
	__asm __volatile("femms":::"memory");
#endif
        for(; i < frame_len; i++)
        {
            real_t inp0 = input[ch ][i];
            real_t inp1 = input[ch1][i];
            (*sample_buffer)[(i*2)+0] = inp0*FLOAT_SCALE;
            (*sample_buffer)[(i*2)+1] = inp1*FLOAT_SCALE;
        }
        break;
    default:
        for (ch = 0; ch < channels; ch++)
        {
            for(i = 0; i < frame_len; i++)
            {
                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
                (*sample_buffer)[(i*channels)+ch] = inp*FLOAT_SCALE;
            }
        }
        break;
    }
}

Update of /cvsroot/mplayerxp/mplayerxp/codecs/liba52
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18545

Modified Files:
	imdct.c 
Log Message:
better optimization describing

Index: imdct.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/codecs/liba52/imdct.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -u -d -r1.4 -r1.5
--- imdct.c	16 Nov 2004 08:42:31 -0000	1.4
+++ imdct.c	17 Nov 2004 08:57:16 -0000	1.5
@@ -452,12 +452,13 @@ char * a52_imdct_init (uint32_t mm_accel
 	post2[i].real = cos ((M_PI / 128) * (i + 0.5));
 	post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
     }
-
+	rval="generic";
 #ifdef CAN_COMPILE_X86_ASM
 	if(a52_accel & MM_ACCEL_X86_SSE) rval="SSE";
 	else
 	if(a52_accel & MM_ACCEL_X86_3DNOW) rval="3DNow!";
-	else	rval="generic";
+	else
+	if(a52_accel & MM_ACCEL_X86_MMX) rval="MMX";
 #endif
     ifft128 = ifft128_c;
     ifft64 = ifft64_c;

Update of /cvsroot/mplayerxp/mplayerxp/codecs/liba52
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30725

Modified Files:
	imdct.c 
Added Files:
	imdct_mmx.h 
Log Message:
begin to restore imdct optimization

--- NEW FILE: imdct_mmx.h ---
static void RENAME(ifft2_2) (complex_t * buf)
{
#ifdef HAVE_SSE
    __asm __volatile(
	"movups	(%0), %%xmm0\n\t"
	"movaps	%%xmm0, %%xmm1\n\t"
	"shufps $0xD8, %%xmm0, %%xmm2\n\t"
	"addps	%%xmm2, %%xmm0\n\t"
	"subps	%%xmm2, %%xmm1\n\t"
	"movups %%xmm0, (%0)\n\t"
	"movups %%xmm1, 16(%0)\n\t"
	::"g"(buf):"memory");
#elif defined( HAVE_3DNOW )
    __asm __volatile(
	"movq	(%0), %%mm0\n\t"
	"movq	16(%0), %%mm4\n\t"
	"movq	%%mm0, %%mm2\n\t"
	"movq	%%mm4, %%mm6\n\t"
	"pfadd	8(%0),%%mm0\n\t"
	"pfadd	24(%0),%%mm4\n\t"
	"pfsub	8(%0),%%mm2\n\t"
	"pfsub	24(%0),%%mm6\n\t"
	"movq	%%mm0, (%0)\n\t"
	"movq	%%mm2, 8(%0)\n\t"
	"movq	%%mm4, 16(%0)\n\t"
	"movq	%%mm6, 24(%0)\n\t"
	"femms"
	::"g"(buf):"memory");
#else
    double r, i;
    r = buf[0].real;
    i = buf[0].imag;
    buf[0].real += buf[1].real;
    buf[0].imag += buf[1].imag;
    buf[1].real = r - buf[1].real;
    buf[1].imag = i - buf[1].imag;

    r = buf[2].real;
    i = buf[2].imag;
    buf[2].real += buf[3].real;
    buf[2].imag += buf[3].imag;
    buf[3].real = r - buf[3].real;
    buf[3].imag = i - buf[3].imag;
#endif
}

Index: imdct.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/codecs/liba52/imdct.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- imdct.c	16 Nov 2004 07:22:46 -0000	1.3
+++ imdct.c	16 Nov 2004 08:42:31 -0000	1.4
@@ -28,9 +28,6 @@
 
 #include <math.h>
 #include <stdio.h>
-#ifdef LIBA52_DJBFFT
-#include <fftc4.h>
-#endif
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795029
 #endif
@@ -73,17 +70,55 @@ static sample_t a52_imdct_window[256];
 static void (* ifft128) (complex_t * buf);
 static void (* ifft64) (complex_t * buf);
 
-static inline void ifft2 (complex_t * buf)
-{
-    double r, i;
+extern uint32_t a52_accel;
 
-    r = buf[0].real;
-    i = buf[0].imag;
-    buf[0].real += buf[1].real;
-    buf[0].imag += buf[1].imag;
-    buf[1].real = r - buf[1].real;
-    buf[1].imag = i - buf[1].imag;
+#undef HAVE_MMX
+#undef HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_3DNOWEX
+#undef HAVE_SSE
+#define RENAME(a) a ## _c
+#include "imdct_mmx.h"
+
+#ifdef ARCH_X86
+#define CAN_COMPILE_X86_ASM
+#endif
+
+#ifdef CAN_COMPILE_X86_ASM
+
+//3DNow! versions
+#undef RENAME
+#define HAVE_MMX
+#undef HAVE_MMX2
+#define HAVE_3DNOW
+#define RENAME(a) a ## _3DNow
+#include "imdct_mmx.h"
+
+//MMX2 versions
+#undef RENAME
+#define HAVE_MMX
+#define HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_3DNOWEX
+#define HAVE_SSE
+#define RENAME(a) a ## _SSE
+#include "imdct_mmx.h"
+
+#endif // CAN_COMPILE_X86_ASM
+
+static void (*ifft2_2) (complex_t * buf);
+static void ifft2_2_init (complex_t * buf)
+{
+#ifdef CAN_COMPILE_X86_ASM
+	if(a52_accel & MM_ACCEL_X86_SSE) ifft2_2 = ifft2_2_SSE;
+	else
+	if(a52_accel & MM_ACCEL_X86_3DNOW) ifft2_2 = ifft2_2_3DNow;
+	else
+#endif //CAN_COMPILE_X86_ASM
+	ifft2_2 = ifft2_2_c;
+	(*ifft2_2)(buf);
 }
+static void (*ifft2_2) (complex_t * buf)=ifft2_2_init;
 
 static inline void ifft4 (complex_t * buf)
 {
@@ -172,8 +207,8 @@ static inline void ifft8 (complex_t * bu
     double tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
 
     ifft4 (buf);
-    ifft2 (buf + 4);
-    ifft2 (buf + 6);
+    ifft2_2 (buf+4);
+//    ifft2 (buf + 6);
     BUTTERFLY_ZERO (buf[0], buf[2], buf[4], buf[6]);
     BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]);
 }
@@ -418,17 +453,13 @@ char * a52_imdct_init (uint32_t mm_accel
 	post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
     }
 
-#ifdef LIBA52_DJBFFT
-    if (mm_accel & MM_ACCEL_DJBFFT) {
-	fprintf (stderr, "Using djbfft for IMDCT transform\n");
-	ifft128 = (void (*) (complex_t *)) fftc4_un128;
-	ifft64 = (void (*) (complex_t *)) fftc4_un64;
-    } else
+#ifdef CAN_COMPILE_X86_ASM
+	if(a52_accel & MM_ACCEL_X86_SSE) rval="SSE";
+	else
+	if(a52_accel & MM_ACCEL_X86_3DNOW) rval="3DNow!";
+	else	rval="generic";
 #endif
-    {
-	rval="generic";
-	ifft128 = ifft128_c;
-	ifft64 = ifft64_c;
-    }
+    ifft128 = ifft128_c;
+    ifft64 = ifft64_c;
     return rval;
 }