summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-11-17 14:26:36 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-11-17 14:26:36 +0000
commitbacac99192b65faed1a0047a8be5b95abf15873d (patch)
treec1ca0949f9cb222c8ef6305d8150ca4d9e85b4a7 /src/video_out
parent75a1024fb27dbff9c4bfc948392910af94797683 (diff)
downloadxine-lib-bacac99192b65faed1a0047a8be5b95abf15873d.tar.gz
xine-lib-bacac99192b65faed1a0047a8be5b95abf15873d.tar.bz2
Add 'xine_' prefix to all of xine-utils functions (what about cpu
acceleration?). Merge xine-utils header files to a new one "xineutils.h". Update xine-lib C/headers to reflect those changes. dxr3 headers are no more installed ine $includdir, but $includdir/xine. CVS patchset: 1054 CVS date: 2001/11/17 14:26:36
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/deinterlace.c44
-rw-r--r--src/video_out/video_out_syncfb.c15
-rw-r--r--src/video_out/video_out_xshm.c15
-rw-r--r--src/video_out/video_out_xv.c13
-rw-r--r--src/video_out/yuv2rgb.c63
-rw-r--r--src/video_out/yuv2rgb_mmx.c14
6 files changed, 77 insertions, 87 deletions
diff --git a/src/video_out/deinterlace.c b/src/video_out/deinterlace.c
index ea8964a7b..9b057f51d 100644
--- a/src/video_out/deinterlace.c
+++ b/src/video_out/deinterlace.c
@@ -28,10 +28,8 @@
#include <string.h>
#include "xine_internal.h"
#include "deinterlace.h"
-#include "memcpy.h"
+#include "xineutils.h"
-#include "cpu_accel.c"
-#include "memcpy.c"
/*
DeinterlaceFieldBob algorithm
@@ -72,9 +70,9 @@ static void deinterlace_bob_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// copy first even line no matter what, and the first odd line if we're
// processing an odd field.
- fast_memcpy(pdst, pEvenLines, LineLength);
+ xine_fast_memcpy(pdst, pEvenLines, LineLength);
if (IsOdd)
- fast_memcpy(pdst + LineLength, pOddLines, LineLength);
+ xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength);
height = height / 2;
for (Line = 0; Line < height - 1; ++Line)
@@ -103,7 +101,7 @@ static void deinterlace_bob_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// half the time this function is called, those words' meanings will invert.
// Copy the odd line to the overlay verbatim.
- fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
+ xine_fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
n = LineLength >> 3;
while( n-- )
@@ -167,7 +165,7 @@ static void deinterlace_bob_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// Copy last odd line if we're processing an even field.
if (! IsOdd)
{
- fast_memcpy(pdst + (height * 2 - 1) * LineLength,
+ xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
pOddLines + (height - 1) * SourcePitch,
LineLength);
}
@@ -236,9 +234,9 @@ static int deinterlace_weave_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// copy first even line no matter what, and the first odd line if we're
// processing an even field.
- fast_memcpy(pdst, pEvenLines, LineLength);
+ xine_fast_memcpy(pdst, pEvenLines, LineLength);
if (!IsOdd)
- fast_memcpy(pdst + LineLength, pOddLines, LineLength);
+ xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength);
height = height / 2;
for (Line = 0; Line < height - 1; ++Line)
@@ -271,7 +269,7 @@ static int deinterlace_weave_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// Copy the even scanline below this one to the overlay buffer, since we'll be
// adapting the current scanline to the even lines surrounding it. The scanline
// above has already been copied by the previous pass through the loop.
- fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
+ xine_fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
n = LineLength >> 3;
while( n-- )
@@ -356,7 +354,7 @@ static int deinterlace_weave_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// Copy last odd line if we're processing an odd field.
if (IsOdd)
{
- fast_memcpy(pdst + (height * 2 - 1) * LineLength,
+ xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
pOddLines + (height - 1) * SourcePitch,
LineLength);
}
@@ -421,9 +419,9 @@ static int deinterlace_greedy_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
// copy first even line no matter what, and the first odd line if we're
// processing an EVEN field. (note diff from other deint rtns.)
- fast_memcpy(pdst, pEvenLines, LineLength); //DL0
+ xine_fast_memcpy(pdst, pEvenLines, LineLength); //DL0
if (!IsOdd)
- fast_memcpy(pdst + LineLength, pOddLines, LineLength); //DL1
+ xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength); //DL1
height = height / 2;
for (Line = 0; Line < height - 1; ++Line)
@@ -447,7 +445,7 @@ static int deinterlace_greedy_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
Dest = (uint64_t *)(pdst + (Line * 2 + 2) * LineLength);
}
- fast_memcpy((char *)Dest + LineLength, L3, LineLength);
+ xine_fast_memcpy((char *)Dest + LineLength, L3, LineLength);
// For ease of reading, the comments below assume that we're operating on an odd
// field (i.e., that info->IsOdd is true). Assume the obvious for even lines..
@@ -528,7 +526,7 @@ static int deinterlace_greedy_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
/* Copy last odd line if we're processing an Odd field. */
if (IsOdd)
{
- fast_memcpy(pdst + (height * 2 - 1) * LineLength,
+ xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
pOddLines + (height - 1) * SourcePitch,
LineLength);
}
@@ -568,9 +566,9 @@ static void deinterlace_onefield_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
* processing an odd field.
*/
- fast_memcpy(pdst, pEvenLines, LineLength);
+ xine_fast_memcpy(pdst, pEvenLines, LineLength);
if (IsOdd)
- fast_memcpy(pdst + LineLength, pOddLines, LineLength);
+ xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength);
height = height / 2;
for (Line = 0; Line < height - 1; ++Line)
@@ -589,7 +587,7 @@ static void deinterlace_onefield_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
}
// Copy the odd line to the overlay verbatim.
- fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
+ xine_fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
n = LineLength >> 3;
while( n-- )
@@ -611,7 +609,7 @@ static void deinterlace_onefield_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
/* Copy last odd line if we're processing an even field. */
if (! IsOdd)
{
- fast_memcpy(pdst + (height * 2 - 1) * LineLength,
+ xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
pOddLines + (height - 1) * SourcePitch,
LineLength);
}
@@ -630,7 +628,7 @@ static int check_for_mmx(void)
static int config_flags = -1;
if ( config_flags == -1 )
- config_flags = mm_accel();
+ config_flags = xine_mm_accel();
if (config_flags & MM_ACCEL_X86_MMX)
return 1;
return 0;
@@ -658,7 +656,7 @@ void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc[],
{
switch( method ) {
case DEINTERLACE_NONE:
- fast_memcpy(pdst,psrc[0],width*height);
+ xine_fast_memcpy(pdst,psrc[0],width*height);
break;
case DEINTERLACE_BOB:
if( check_for_mmx() )
@@ -670,7 +668,7 @@ void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc[],
if( check_for_mmx() )
{
if( !deinterlace_weave_yuv_mmx(pdst,psrc,width,height) )
- fast_memcpy(pdst,psrc[0],width*height);
+ xine_fast_memcpy(pdst,psrc[0],width*height);
}
else /* FIXME: provide an alternative? */
abort_mmx_missing();
@@ -679,7 +677,7 @@ void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc[],
if( check_for_mmx() )
{
if( !deinterlace_greedy_yuv_mmx(pdst,psrc,width,height) )
- fast_memcpy(pdst,psrc[0],width*height);
+ xine_fast_memcpy(pdst,psrc[0],width*height);
}
else /* FIXME: provide an alternative? */
abort_mmx_missing();
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index e62460c20..9397dffdb 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_syncfb.c,v 1.45 2001/11/09 19:53:57 joachim_koenig Exp $
+ * $Id: video_out_syncfb.c,v 1.46 2001/11/17 14:26:39 f1rmb Exp $
*
* video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
*
@@ -54,12 +54,11 @@
#include "video_out_syncfb.h"
-#include "monitor.h"
#include "video_out.h"
#include "video_out_x11.h"
#include "xine_internal.h"
#include "alphablend.h"
-#include "memcpy.h"
+#include "xineutils.h"
uint32_t xine_debug;
@@ -258,7 +257,7 @@ static void write_frame_YUV420P2(syncfb_driver_t* this, syncfb_frame_t* frame)
dst8 = this->video_mem + this->bufinfo.offset;
for(h = 0; h < frame->height; h++) {
- fast_memcpy(dst8, y, frame->width);
+ xine_fast_memcpy(dst8, y, frame->width);
y += frame->width;
dst8 += bespitch;
}
@@ -274,21 +273,21 @@ static void write_frame_YUV420P3(syncfb_driver_t* this, syncfb_frame_t* frame)
int bespitch = (frame->width + 31) & ~31;
for(h = 0; h < frame->height; h++) {
- fast_memcpy(dst8, y, frame->width);
+ xine_fast_memcpy(dst8, y, frame->width);
y += frame->width;
dst8 += bespitch;
}
dst8 = this->video_mem + this->bufinfo.offset_p2;
for(h = 0; h < (frame->height / 2); h++) {
- fast_memcpy(dst8, cb, (frame->width / 2));
+ xine_fast_memcpy(dst8, cb, (frame->width / 2));
cb += (frame->width / 2);
dst8 += (bespitch / 2);
}
dst8 = this->video_mem + this->bufinfo.offset_p3;
for(h=0; h < (frame->height / 2); h++) {
- fast_memcpy(dst8, cr, (frame->width / 2));
+ xine_fast_memcpy(dst8, cr, (frame->width / 2));
cr += (frame->width / 2);
dst8 += (bespitch / 2);
}
@@ -302,7 +301,7 @@ static void write_frame_YUY2(syncfb_driver_t* this, syncfb_frame_t* frame)
int bespitch = (frame->width + 31) & ~31;
for(h = 0; h < frame->height; h++) {
- fast_memcpy(dst8, src8, (frame->width * 2));
+ xine_fast_memcpy(dst8, src8, (frame->width * 2));
dst8 += (bespitch * 2);
src8 += (frame->width * 2);
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 115883a6c..85cbaf261 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xshm.c,v 1.49 2001/10/29 02:15:22 miguelfreitas Exp $
+ * $Id: video_out_xshm.c,v 1.50 2001/11/17 14:26:39 f1rmb Exp $
*
* video_out_xshm.c, X11 shared memory extension interface for xine
*
@@ -54,11 +54,10 @@
#include <netinet/in.h>
#include "xine_internal.h"
-#include "monitor.h"
-#include "utils.h"
#include "video_out_x11.h"
#include "alphablend.h"
#include "yuv2rgb.h"
+#include "xineutils.h"
uint32_t xine_debug;
@@ -192,7 +191,7 @@ static void *my_malloc_aligned (size_t alignment, size_t size, uint8_t **chunk)
uint8_t *pMem;
- pMem = xmalloc (size+alignment);
+ pMem = xine_xmalloc (size+alignment);
*chunk = pMem;
@@ -312,7 +311,7 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
this->bytes_per_pixel = this->bpp / 8;
this->image_byte_order = myimage->byte_order;
- myimage->data = xmalloc (width * this->bytes_per_pixel * height);
+ myimage->data = xine_xmalloc (width * this->bytes_per_pixel * height);
}
return myimage;
@@ -353,7 +352,7 @@ static void xshm_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
xshm_driver_t *this = (xshm_driver_t *) vo_img->instance->driver;
- profiler_start_count (this->prof_yuv2rgb);
+ xine_profiler_start_count (this->prof_yuv2rgb);
if (frame->format == IMGFMT_YV12) {
this->yuv2rgb->yuv2rgb_fun (this->yuv2rgb, frame->rgb_dst,
@@ -365,7 +364,7 @@ static void xshm_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
}
- profiler_stop_count (this->prof_yuv2rgb);
+ xine_profiler_stop_count (this->prof_yuv2rgb);
frame->rgb_dst += frame->stripe_inc;
}
@@ -1212,7 +1211,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
this->gc = XCreateGC (this->display, this->drawable,
0, NULL);
- this->prof_yuv2rgb = profiler_allocate_slot ("xshm yuv2rgb convert");
+ this->prof_yuv2rgb = xine_profiler_allocate_slot ("xshm yuv2rgb convert");
this->vo_driver.get_capabilities = xshm_get_capabilities;
this->vo_driver.alloc_frame = xshm_alloc_frame;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index ea264353c..4299bac9f 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xv.c,v 1.74 2001/11/09 14:06:48 matt2000 Exp $
+ * $Id: video_out_xv.c,v 1.75 2001/11/17 14:26:39 f1rmb Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -50,14 +50,13 @@
#include <stdlib.h>
#include <string.h>
-#include "monitor.h"
#include "video_out.h"
#include "video_out_x11.h"
#include "xine_internal.h"
/* #include "overlay.h" */
#include "alphablend.h"
#include "deinterlace.h"
-#include "memcpy.h"
+#include "xineutils.h"
uint32_t xine_debug;
@@ -473,7 +472,7 @@ static void xv_deinterlace_frame (xv_driver_t *this) {
#else
/* know bug: we are not deinterlacing Cb and Cr */
- fast_memcpy(this->deinterlace_frame.image->data + frame->width*frame->height,
+ xine_fast_memcpy(this->deinterlace_frame.image->data + frame->width*frame->height,
frame->image->data + frame->width*frame->height,
frame->width*frame->height*1/2);
@@ -498,7 +497,7 @@ static void xv_deinterlace_frame (xv_driver_t *this) {
dst = this->deinterlace_frame.image->data;
src = this->recent_frames[0]->image->data;
for( i = 0; i < frame->height; i+=2 ) {
- fast_memcpy(dst,src,frame->width);
+ xine_fast_memcpy(dst,src,frame->width);
dst+=frame->width;
src+=2*frame->width;
}
@@ -506,7 +505,7 @@ static void xv_deinterlace_frame (xv_driver_t *this) {
dst = this->deinterlace_frame.image->data + frame->width*frame->height/2;
src = this->recent_frames[0]->image->data + frame->width*frame->height;
for( i = 0; i < frame->height; i+=4 ) {
- fast_memcpy(dst,src,frame->width/2);
+ xine_fast_memcpy(dst,src,frame->width/2);
dst+=frame->width/2;
src+=frame->width;
}
@@ -514,7 +513,7 @@ static void xv_deinterlace_frame (xv_driver_t *this) {
dst = this->deinterlace_frame.image->data + frame->width*frame->height*5/8;
src = this->recent_frames[0]->image->data + frame->width*frame->height*5/4;
for( i = 0; i < frame->height; i+=4 ) {
- fast_memcpy(dst,src,frame->width/2);
+ xine_fast_memcpy(dst,src,frame->width/2);
dst+=frame->width/2;
src+=frame->width;
}
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index ec1015b82..587292618 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: yuv2rgb.c,v 1.26 2001/10/29 02:15:22 miguelfreitas Exp $
+ * $Id: yuv2rgb.c,v 1.27 2001/11/17 14:26:39 f1rmb Exp $
*/
#include "config.h"
@@ -33,11 +33,8 @@
#include <inttypes.h>
#include "yuv2rgb.h"
-#include "attributes.h"
-#include "cpu_accel.h"
-#include "monitor.h"
-#include "utils.h"
-#include "memcpy.h"
+#include "xineutils.h"
+
static int prof_scale_line = -1;
@@ -60,7 +57,7 @@ static void *my_malloc_aligned (size_t alignment, size_t size, void **chunk) {
char *pMem;
- pMem = xmalloc (size+alignment);
+ pMem = xine_xmalloc (size+alignment);
*chunk = pMem;
@@ -81,7 +78,7 @@ int yuv2rgb_setup (yuv2rgb_t *this,
dest_width, dest_height);
*/
if (prof_scale_line == -1)
- prof_scale_line = profiler_allocate_slot("xshm scale line");
+ prof_scale_line = xine_profiler_allocate_slot("xshm scale line");
this->source_width = source_width;
this->source_height = source_height;
@@ -158,7 +155,7 @@ static void scale_line_gen (uint8_t *source, uint8_t *dest,
int p2;
int dx;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
p1 = *source++;
p2 = *source++;
@@ -179,7 +176,7 @@ static void scale_line_gen (uint8_t *source, uint8_t *dest,
width --;
}
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
/*
@@ -193,7 +190,7 @@ static void scale_line_15_16 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 16) >= 0) {
p1 = source[0];
@@ -262,7 +259,7 @@ static void scale_line_15_16 (uint8_t *source, uint8_t *dest,
if (--width <= 0) goto done;
*dest++ = (7*source[13] + 1*source[14]) >> 3;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -279,7 +276,7 @@ static void scale_line_45_53 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 53) >= 0) {
p1 = source[0];
@@ -491,7 +488,7 @@ static void scale_line_45_53 (uint8_t *source, uint8_t *dest,
*dest++ = (3*source[43] + 1*source[44]) >> 2;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -507,7 +504,7 @@ static void scale_line_45_64 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 64) >= 0) {
p1 = source[0];
@@ -752,7 +749,7 @@ static void scale_line_45_64 (uint8_t *source, uint8_t *dest,
*dest++ = (3*source[43] + 5*source[44]) >> 3;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -766,7 +763,7 @@ static void scale_line_9_16 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 16) >= 0) {
p1 = source[0];
@@ -830,7 +827,7 @@ static void scale_line_9_16 (uint8_t *source, uint8_t *dest,
if (--width <= 0) goto done;
*dest++ = (1*source[7] + 7*source[8]) >> 3;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -843,7 +840,7 @@ static void scale_line_11_12 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 12) >= 0) {
p1 = source[0];
@@ -898,7 +895,7 @@ static void scale_line_11_12 (uint8_t *source, uint8_t *dest,
*dest++ = (7*source[9] + 1*source[10]) >> 3;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -912,7 +909,7 @@ static void scale_line_11_24 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 24) >= 0) {
p1 = source[0];
@@ -1003,7 +1000,7 @@ static void scale_line_11_24 (uint8_t *source, uint8_t *dest,
*dest++ = (7*source[10] + 1*source[11]) >> 3;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -1016,7 +1013,7 @@ static void scale_line_5_8 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 8) >= 0) {
p1 = source[0];
@@ -1053,7 +1050,7 @@ static void scale_line_5_8 (uint8_t *source, uint8_t *dest,
*dest++ = (1*source[3] + 3*source[4]) >> 2;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -1066,7 +1063,7 @@ static void scale_line_3_4 (uint8_t *source, uint8_t *dest,
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
while ((width -= 4) >= 0) {
p1 = source[0];
@@ -1089,7 +1086,7 @@ static void scale_line_3_4 (uint8_t *source, uint8_t *dest,
*dest++ = (1*source[1] + 1*source[2]) >> 1;
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -1099,7 +1096,7 @@ static void scale_line_1_2 (uint8_t *source, uint8_t *dest,
int width, int step) {
int p1, p2;
- profiler_start_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
p1 = *source;
while ((width -= 4) >= 0) {
@@ -1119,7 +1116,7 @@ static void scale_line_1_2 (uint8_t *source, uint8_t *dest,
*dest++ = source[1];
done:
- profiler_stop_count(prof_scale_line);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -1130,9 +1127,9 @@ static void scale_line_1_2 (uint8_t *source, uint8_t *dest,
static void scale_line_1_1 (uint8_t *source, uint8_t *dest,
int width, int step) {
- profiler_start_count(prof_scale_line);
- fast_memcpy(dest, source, width);
- profiler_stop_count(prof_scale_line);
+ xine_profiler_start_count(prof_scale_line);
+ xine_fast_memcpy(dest, source, width);
+ xine_profiler_stop_count(prof_scale_line);
}
@@ -2962,9 +2959,9 @@ static void yuy22rgb_c_init (yuv2rgb_t *this, int mode, int swapped)
yuv2rgb_t *yuv2rgb_init (int mode, int swapped, uint8_t *colormap) {
#ifdef ARCH_X86
- uint32_t mm = mm_accel();
+ uint32_t mm = xine_mm_accel();
#endif
- yuv2rgb_t *this = xmalloc (sizeof (yuv2rgb_t));
+ yuv2rgb_t *this = xine_xmalloc (sizeof (yuv2rgb_t));
this->matrix_coefficients = 6;
diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index d085fc635..8c94e5cb5 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -31,10 +31,8 @@
#include <string.h>
#include <inttypes.h>
-#include "attributes.h"
-#include "cpu_accel.h"
#include "yuv2rgb.h"
-#include "memcpy.h"
+#include "xineutils.h"
#define CPU_MMXEXT 0
#define CPU_MMX 1
@@ -453,7 +451,7 @@ static inline void yuv420_rgb16 (yuv2rgb_t *this,
while (--dst_height > 0 && dy < 32768) {
- fast_memcpy (image, image-rgb_stride, this->dest_width*2);
+ xine_fast_memcpy (image, image-rgb_stride, this->dest_width*2);
dy += this->step_dy;
image += rgb_stride;
@@ -561,7 +559,7 @@ static inline void yuv420_rgb15 (yuv2rgb_t *this,
while (--dst_height > 0 && dy < 32768) {
- fast_memcpy (image, image-rgb_stride, this->dest_width*2);
+ xine_fast_memcpy (image, image-rgb_stride, this->dest_width*2);
dy += this->step_dy;
image += rgb_stride;
@@ -668,7 +666,7 @@ static inline void yuv420_rgb24 (yuv2rgb_t *this,
while (--dst_height > 0 && dy < 32768) {
- fast_memcpy (image, image-rgb_stride, this->dest_width*3);
+ xine_fast_memcpy (image, image-rgb_stride, this->dest_width*3);
dy += this->step_dy;
image += rgb_stride;
@@ -776,7 +774,7 @@ static inline void yuv420_argb32 (yuv2rgb_t *this,
while (--dst_height > 0 && dy < 32768) {
- fast_memcpy (image, image-rgb_stride, this->dest_width*4);
+ xine_fast_memcpy (image, image-rgb_stride, this->dest_width*4);
dy += this->step_dy;
image += rgb_stride;
@@ -884,7 +882,7 @@ static inline void yuv420_abgr32 (yuv2rgb_t *this,
while (--dst_height > 0 && dy < 32768) {
- fast_memcpy (image, image-rgb_stride, this->dest_width*4);
+ xine_fast_memcpy (image, image-rgb_stride, this->dest_width*4);
dy += this->step_dy;
image += rgb_stride;