Thread: [Mplayerxp-cvslog] SF.net SVN: mplayerxp:[297] mplayerxp (Page 13)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 297
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=297&view=rev
Author:   nickols_k
Date:     2012-11-04 09:56:36 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
minor fixups

Modified Paths:
--------------
    mplayerxp/libvo/vo_x11.c
    mplayerxp/mplayer.c
    mplayerxp/osdep/mp_malloc.c
    mplayerxp/postproc/af.c
    mplayerxp/postproc/af.h
    mplayerxp/postproc/af_resample.c
    mplayerxp/postproc/af_resample.h

Modified: mplayerxp/libvo/vo_x11.c
===================================================================

--- mplayerxp/libvo/vo_x11.c	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/libvo/vo_x11.c	2012-11-04 09:56:36 UTC (rev 297)
@@ -303,6 +303,8 @@
 	else
 	    return 0x1|0x4;
     }
+// just for tests:
+//if(format->fourcc==IMGFMT_YUY2) return 0x1|0x2|0x4;
     return 0;
 }
 

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/mplayer.c	2012-11-04 09:56:36 UTC (rev 297)
@@ -499,7 +499,7 @@
     gCpuCaps.has3DNowExt=
     gCpuCaps.hasSSE=
     gCpuCaps.hasSSE2=
-    gCpuCaps.hasSSE2=
+    gCpuCaps.hasSSE3=
     gCpuCaps.hasSSSE3=
     gCpuCaps.hasSSE41=
     gCpuCaps.hasSSE42=

Modified: mplayerxp/osdep/mp_malloc.c
===================================================================
--- mplayerxp/osdep/mp_malloc.c	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/osdep/mp_malloc.c	2012-11-04 09:56:36 UTC (rev 297)
@@ -41,7 +41,7 @@
 static priv_t* priv;
 
 static any_t* prot_page_align(any_t *ptr) { return (any_t*)(((unsigned long)ptr)&(~(__VM_PAGE_SIZE__-1))); }
-static size_t prot_fullsize(size_t size) {
+static size_t app_fullsize(size_t size) {
     unsigned npages = size/__VM_PAGE_SIZE__;
     unsigned fullsize;
     if(size%__VM_PAGE_SIZE__) npages++;
@@ -95,9 +95,11 @@
     } else printf("[prot_free_slot] Internal error! Can't find slot for address: %p\n",ptr);
 }
 
-static any_t* __prot_malloc(size_t size) {
+/* ----------- append ------------ */
+
+static any_t* __prot_malloc_append(size_t size) {
     any_t* rp;
-    size_t fullsize=prot_fullsize(size);
+    size_t fullsize=app_fullsize(size);
     rp=memalign(__VM_PAGE_SIZE__,fullsize);
     if(rp) {
 	prot_append_slot(&priv->mallocs,rp,size);
@@ -108,58 +110,109 @@
     return rp;
 }
 
-static any_t* __prot_memalign(size_t boundary,size_t size) { UNUSED(boundary);  return __prot_malloc(size); }
+static any_t* __prot_memalign_append(size_t boundary,size_t size) { UNUSED(boundary);  return __prot_malloc_append(size); }
 
-static void __prot_free(any_t*ptr) {
+static void __prot_free_append(any_t*ptr) {
     any_t *page_ptr=prot_page_align(ptr);
-    free(page_ptr);
     mp_slot_t* slot=prot_find_slot(&priv->mallocs,page_ptr);
     if(!slot) {
-	printf("[__prot_free] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
+	printf("[__prot_free_append] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
 	__prot_print_slots(&priv->mallocs);
 	kill(getpid(), SIGILL);
     }
-    size_t fullsize=prot_fullsize(slot->size);
+    size_t fullsize=app_fullsize(slot->size);
     mprotect(prot_last_page(page_ptr,fullsize),__VM_PAGE_SIZE__,MP_PROT_READ|MP_PROT_WRITE);
+    free(page_ptr);
     prot_free_slot(&priv->mallocs,page_ptr);
 }
 
 #define min(a,b) ((a)<(b)?(a):(b))
-static any_t* __prot_realloc(any_t*ptr,size_t size) {
+static any_t* __prot_realloc_append(any_t*ptr,size_t size) {
     any_t* rp;
-    if((rp=__prot_malloc(size))!=NULL && ptr) {
+    if((rp=__prot_malloc_append(size))!=NULL && ptr) {
 	mp_slot_t* slot=prot_find_slot(&priv->mallocs,prot_page_align(ptr));
 	if(!slot) {
-	    printf("[__prot_realloc] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,prot_page_align(ptr));
+	    printf("[__prot_realloc_append] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,prot_page_align(ptr));
 	    __prot_print_slots(&priv->mallocs);
 	    kill(getpid(), SIGILL);
 	}
 	memcpy(rp,ptr,min(slot->size,size));
-	__prot_free(ptr);
+	__prot_free_append(ptr);
     }
     return rp;
 }
 
+/* ----------- prepend ------------ */
+static any_t* pre_page_align(any_t *ptr) { return (any_t*)((unsigned long)ptr-__VM_PAGE_SIZE__); }
+static size_t pre_fullsize(size_t size) { return size+__VM_PAGE_SIZE__; }
+
+static any_t* __prot_malloc_prepend(size_t size) {
+    any_t* rp;
+    size_t fullsize=pre_fullsize(size);
+    rp=memalign(__VM_PAGE_SIZE__,fullsize);
+    if(rp) {
+	prot_append_slot(&priv->mallocs,rp,size);
+	// protect last page here
+	mprotect(rp,__VM_PAGE_SIZE__,MP_DENY_ALL);
+	rp+=__VM_PAGE_SIZE__;
+    }
+    return rp;
+}
+
+static any_t* __prot_memalign_prepend(size_t boundary,size_t size) { UNUSED(boundary);  return __prot_malloc_prepend(size); }
+
+static void __prot_free_prepend(any_t*ptr) {
+    any_t *page_ptr=pre_page_align(ptr);
+    mp_slot_t* slot=prot_find_slot(&priv->mallocs,page_ptr);
+    if(!slot) {
+	printf("[__prot_free_prepend] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,page_ptr);
+	__prot_print_slots(&priv->mallocs);
+	kill(getpid(), SIGILL);
+    }
+    mprotect(page_ptr,__VM_PAGE_SIZE__,MP_PROT_READ|MP_PROT_WRITE);
+    free(page_ptr);
+    prot_free_slot(&priv->mallocs,page_ptr);
+}
+
+static any_t* __prot_realloc_prepend(any_t*ptr,size_t size) {
+    any_t* rp;
+    if((rp=__prot_malloc_prepend(size))!=NULL && ptr) {
+	mp_slot_t* slot=prot_find_slot(&priv->mallocs,pre_page_align(ptr));
+	if(!slot) {
+	    printf("[__prot_realloc_prepend] suspect call found! Can't find slot for address: %p [aligned: %p]\n",ptr,pre_page_align(ptr));
+	    __prot_print_slots(&priv->mallocs);
+	    kill(getpid(), SIGILL);
+	}
+	memcpy(rp,ptr,min(slot->size,size));
+	__prot_free_prepend(ptr);
+    }
+    return rp;
+}
+
 static any_t* prot_malloc(size_t size) {
     any_t* rp;
-    rp=__prot_malloc(size);
+    if(priv->flags&MPA_FLG_BOUNDS_CHECK) rp=__prot_malloc_append(size);
+    else				 rp=__prot_malloc_prepend(size);
     return rp;
 }
 
 static any_t* prot_memalign(size_t boundary,size_t size) {
     any_t* rp;
-    rp=__prot_memalign(boundary,size);
+    if(priv->flags&MPA_FLG_BOUNDS_CHECK) rp=__prot_memalign_append(boundary,size);
+    else				 rp=__prot_memalign_prepend(boundary,size);
     return rp;
 }
 
 static any_t* prot_realloc(any_t*ptr,size_t size) {
     any_t* rp;
-    rp=__prot_realloc(ptr,size);
+    if(priv->flags&MPA_FLG_BOUNDS_CHECK) rp=__prot_realloc_append(ptr,size);
+    else				 rp=__prot_realloc_prepend(ptr,size);
     return rp;
 }
 
 static void prot_free(any_t*ptr) {
-    __prot_free(ptr);
+    if(priv->flags&MPA_FLG_BOUNDS_CHECK) __prot_free_append(ptr);
+    else				 __prot_free_prepend(ptr);
 }
 
 static __always_inline any_t* bt_malloc(size_t size) {

Modified: mplayerxp/postproc/af.c
===================================================================
--- mplayerxp/postproc/af.c	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/postproc/af.c	2012-11-04 09:56:36 UTC (rev 297)
@@ -383,14 +383,14 @@
 
   // Figure out how fast the machine is
   if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force))
-    s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE;
+    s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE();
 
   // Check if this is the first call
   if(!s->first){
     // Add all filters in the list (if there are any)
     if(!s->cfg.list){      // To make automatic format conversion work
-      if(!af_append(s,s->first,"ao2")) 
-	return -1; 
+      if(!af_append(s,s->first,"ao2"))
+	return -1;
     }
     else{
       af_name=s->cfg.list;
@@ -405,7 +405,7 @@
   }
   if(strcmp(s->last->info->name,"ao2")!=0) if(!af_append(s,s->last,"ao2")) return -1;
 
-  // Init filters 
+  // Init filters
   if(CONTROL_OK != af_reinit(s,s->first))
     return -1;
 
@@ -426,7 +426,7 @@
 	    af = af_append(s,s->first,"resample");
 	  else
 	    af = af_prepend(s,s->first,"resample");
-	}		
+	}
 	else{
 	  if(!strcmp(s->last->info->name,"format"))
 	    af = af_prepend(s,s->last,"resample");
@@ -445,9 +445,9 @@
 	af->control(af, AF_CONTROL_COMMAND_LINE, args);
       }
       if(CONTROL_OK != af_reinit(s,af))
-      	return -1;
-    }	
-      
+	return -1;
+    }
+
     // Check number of output channels fix if not OK
     // If needed always inserted last -> easy to screw up other filters
     if(s->last->data->nch!=s->output.nch){
@@ -461,7 +461,7 @@
       if(CONTROL_OK != af_reinit(s,af))
 	return -1;
     }
-    
+
     // Check output format fix if not OK
     if((s->last->data->format != s->output.format) || 
        (s->last->data->bps != s->output.bps)){
@@ -611,7 +611,7 @@
     if( (t * (((in/t)*mul.n))/mul.d) >= len) return in;
     in+=t;
   }
-  
+
   // Could no meet constraint nr 3.
   while(out > max_outsize || in > max_insize){
     in-=t;
@@ -640,11 +640,11 @@
 {
   // Calculate new length
   register int len = af_lencalc(af->mul,data);
-  MSG_V("[libaf] Reallocating memory in module %s, " 
+  MSG_V("[libaf] Reallocating memory in module %s, "
 	 "old len = %i, new len = %i\n",af->info->name,af->data->len,len);
   // If there is a buffer mp_free it
-  if(af->data->audio) 
-    mp_free(af->data->audio);
+printf("len=%i\n",len);
+  if(af->data->audio) mp_free(af->data->audio);
   // Create new buffer and check that it is OK
   af->data->audio = mp_malloc(len);
   if(!af->data->audio){
@@ -728,10 +728,10 @@
 
 void af_showconf(af_instance_t *first)
 {
-  af_instance_t* af=first; 
+  af_instance_t* af=first;
   // ok!
   MSG_INFO("[libaf] Using audio filters chain:\n");
-  // Iterate through all filters 
+  // Iterate through all filters
   do{
 	MSG_INFO("  ");
 	if(af->control(af,AF_CONTROL_SHOWCONF,NULL)!=CONTROL_OK)

Modified: mplayerxp/postproc/af.h
===================================================================
--- mplayerxp/postproc/af.h	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/postproc/af.h	2012-11-04 09:56:36 UTC (rev 297)
@@ -79,9 +79,9 @@
 // Default init type
 #ifndef AF_INIT_TYPE
 #if defined(HAVE_SSE) || defined(HAVE_3DNOW)
-#define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST)
+static inline int AF_INIT_TYPE(void) { return (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST); }
 #else
-#define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW)
+static inline int AF_INIT_TYPE(void) { return (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW); }
 #endif
 #endif
 
@@ -171,8 +171,8 @@
       block length
    2. OUT <= max_outsize, where max_outsize is the maximum possible
       output block length
-   3. If possible OUT >= len. 
-   Return -1 in case of error */ 
+   3. If possible OUT >= len.
+   Return -1 in case of error */
 int __FASTCALL__ af_calc_insize_constrained(af_stream_t* s, int len,
 			       int max_outsize,int max_insize);
 
@@ -219,8 +219,9 @@
 /* Memory reallocation macro: if a local buffer is used (i.e. if the
    filter doesn't operate on the incoming buffer this macro must be
    called to ensure the buffer is big enough. */
-#define RESIZE_LOCAL_BUFFER(a,d)\
-((a->data->len < af_lencalc(a->mul,d))?af_resize_local_buffer(a,d):CONTROL_OK)
+static inline int RESIZE_LOCAL_BUFFER(af_instance_t* a, af_data_t* d) {
+    return (a->data->len < af_lencalc(a->mul,d))?af_resize_local_buffer(a,d):CONTROL_OK;
+}
 
 /* Some other useful macro definitions*/
 #ifndef min

Modified: mplayerxp/postproc/af_resample.c
===================================================================
--- mplayerxp/postproc/af_resample.c	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/postproc/af_resample.c	2012-11-04 09:56:36 UTC (rev 297)
@@ -52,12 +52,12 @@
 // local data
 typedef struct af_resample_s
 {
-  any_t*  	w;	// Current filter weights
-  any_t** 	xq; 	// Circular buffers
-  uint32_t	xi; 	// Index for circular buffers
+  any_t*	w;	// Current filter weights
+  any_t**	xq;	// Circular buffers
+  uint32_t	xi;	// Index for circular buffers
   uint32_t	wi;	// Index for w
-  uint32_t	i; 	// Number of new samples to put in x queue 
-  uint32_t  	dn;     // Down sampling factor
+  uint32_t	i;	// Number of new samples to put in x queue 
+  uint32_t	dn;	// Down sampling factor
   uint32_t	up;	// Up sampling factor 
   uint64_t	step;	// Step size for linear interpolation
   uint64_t	pt;	// Pointer remainder for linear interpolation
@@ -100,9 +100,9 @@
 // Fast linear interpolation resample with modest audio quality
 static int __FASTCALL__ linint(af_data_t* c,af_data_t* l, af_resample_t* s)
 {
-  uint32_t	len   = 0; 		// Number of input samples
-  uint32_t	nch   = l->nch;   	// Words pre transfer
-  uint64_t	step  = s->step; 
+  uint32_t	len   = 0;		// Number of input samples
+  uint32_t	nch   = l->nch;		// Words pre transfer
+  uint64_t	step  = s->step;
   int16_t*	in16  = ((int16_t*)c->audio);
   int16_t*	out16 = ((int16_t*)l->audio);
   int32_t*	in32  = ((int32_t*)c->audio);
@@ -110,35 +110,35 @@
   uint64_t 	end   = ((((uint64_t)c->len)/2LL)<<STEPACCURACY);
   uint64_t	pt    = s->pt;
   uint16_t 	tmp;
-  
+
   switch (nch){
   case 1:
     while(pt < end){
-      out16[len++]=in16[pt>>STEPACCURACY];    	    
+      out16[len++]=in16[pt>>STEPACCURACY];
       pt+=step;
     }
     s->pt=pt & ((1LL<<STEPACCURACY)-1);
-    break;		
+    break;
   case 2:
     end/=2;
     while(pt < end){
-      out32[len++]=in32[pt>>STEPACCURACY];    	    
+      out32[len++]=in32[pt>>STEPACCURACY];
       pt+=step;
     }
     len=(len<<1);
     s->pt=pt & ((1LL<<STEPACCURACY)-1);
     break;
-  default:	
+  default:
     end /=nch;
     while(pt < end){
       tmp=nch;
-      do {	 
-	tmp--;   
-	out16[len+tmp]=in16[tmp+(pt>>STEPACCURACY)*nch];    	    
+      do {
+	tmp--;
+	out16[len+tmp]=in16[tmp+(pt>>STEPACCURACY)*nch];
       } while (tmp);
       len+=nch;
       pt+=step;
-    }	
+    }
     s->pt=pt & ((1LL<<STEPACCURACY)-1);
   }
   return len;
@@ -345,7 +345,7 @@
   return CONTROL_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void __FASTCALL__ uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -378,7 +378,7 @@
     if(s->up>s->dn){
 #     define UP
 #     include "af_resample.h"
-#     undef UP 
+#     undef UP
     }
     else{
 #     define DN
@@ -392,7 +392,7 @@
     if(s->up>s->dn){
 #     define UP
 #     include "af_resample.h"
-#     undef UP 
+#     undef UP
     }
     else{
 #     define DN

Modified: mplayerxp/postproc/af_resample.h
===================================================================
--- mplayerxp/postproc/af_resample.h	2012-11-04 08:50:52 UTC (rev 296)
+++ mplayerxp/postproc/af_resample.h	2012-11-04 09:56:36 UTC (rev 297)
@@ -1,5 +1,5 @@
 /*=============================================================================
-//	
+//
 //  This software has been released under the terms of the GNU General Public
 //  license. See http://www.gnu.org/copyleft/gpl.html for details.
 //
@@ -11,8 +11,8 @@
 /* This file contains the resampling engine, the sample format is
    controlled by the FORMAT parameter, the filter length by the L
    parameter and the resampling type by UP and DN. This file should
-   only be included by af_resample.c 
-*/ 
+   only be included by af_resample.c
+*/
 
 #undef L
 #undef SHIFT
@@ -48,10 +48,10 @@
 #endif
 
 // Short filter
-#if defined(L8) 
+#if defined(L8)
 
-#define L   	8	// Filter length
-// Unrolled loop to speed up execution 
+#define L	8	// Filter length
+// Unrolled loop to speed up execution
 #if !(defined( ARCH_X86 ) || defined(ARCH_X86_64))
 #define FIR(x,w,y) \
   (y[0])  = ( w[0]*x[0]+w[1]*x[1]+w[2]*x[2]+w[3]*x[3] \
@@ -61,7 +61,7 @@
 
 #else  /* L8/L16 */
 
-#define L   	16
+#define L	16
 // Unrolled loop to speed up execution 
 #if !(defined( ARCH_X86 ) || defined(ARCH_X86_64))
 #define FIR(x,w,y) \
@@ -79,8 +79,8 @@
 
 #if defined(UP)
 
-  uint32_t		inc   = s->up/s->dn; 
-  uint32_t		level = s->up%s->dn; 
+  uint32_t		inc   = s->up/s->dn;
+  uint32_t		level = s->up%s->dn;
   register FORMAT*	w     = s->w;
 
   // Index current channel
@@ -111,8 +111,8 @@
 #endif /* UP */
 
 #if defined(DN) /* DN */
-  uint32_t		inc   = s->dn/s->up; 
-  uint32_t		level = s->dn%s->up; 
+  uint32_t		inc   = s->dn/s->up;
+  uint32_t		level = s->dn%s->up;
   FORMAT*		w     = s->w;
 
   // Index current channel
@@ -132,10 +132,8 @@
 	// Run the FIR filter
 	FIR((&x[xi]),(&w[wi*L]),out);
 	len++;	out+=nch;
-
 	// Update wi to point at the correct polyphase component
 	wi=(wi+dn)%up;
-
 	// Insert i number of new samples in queue
 	i = inc;
 	if(wi<level) i++;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Mplayerxp-cvslog] SF.net SVN: mplayerxp:[297] mplayerxp (Page 13)

mplayerxp-cvslog