[xiph-commits] r12841 - in experimental/j/theora-mashup: . lib/enc
j at svn.xiph.org
j at svn.xiph.org
Mon Apr 9 11:14:19 PDT 2007
Author: j
Date: 2007-04-09 11:14:16 -0700 (Mon, 09 Apr 2007)
New Revision: 12841
Modified:
experimental/j/theora-mashup/configure.ac
experimental/j/theora-mashup/lib/enc/dsp.c
experimental/j/theora-mashup/lib/enc/dsp.h
experimental/j/theora-mashup/lib/enc/mcomp.c
experimental/j/theora-mashup/lib/enc/reconstruct.c
Log:
tabs > spaces
Modified: experimental/j/theora-mashup/configure.ac
===================================================================
--- experimental/j/theora-mashup/configure.ac 2007-04-09 18:08:48 UTC (rev 12840)
+++ experimental/j/theora-mashup/configure.ac 2007-04-09 18:14:16 UTC (rev 12841)
@@ -111,23 +111,23 @@
if test "x${ac_enable_asm}" = xyes; then
cpu_optimization="no optimization for your platform, please send a patch"
case $target_cpu in
- i[[3456]]86)
- cpu_x86_32=yes
- cpu_optimization="32 bit x86"
- AC_DEFINE([USE_ASM], [], [make use of asm optimization])
- if test "x$target_vendor" = "xapple"; then
- THEORA_LDFLAGS="$THEORA_LDFLAGS -Wl,-read_only_relocs,suppress"
- fi
-
- AC_DEFINE([OC_X86ASM], [], [enable x86 assambler optimization])
- AM_CONDITIONAL(OC_X86ASM,true)
- ;;
- x86_64)
- cpu_x86_64=yes
- cpu_optimization="64 bit x86"
- AC_DEFINE([USE_ASM], [], [make use of asm optimization])
- AC_DEFINE([OC_X86ASM], [], [enable x86 assambler optimization])
- AM_CONDITIONAL(OC_X86ASM,true)
+ i[[3456]]86)
+ cpu_x86_32=yes
+ cpu_optimization="32 bit x86"
+ AC_DEFINE([USE_ASM], [], [make use of asm optimization])
+ if test "x$target_vendor" = "xapple"; then
+ THEORA_LDFLAGS="$THEORA_LDFLAGS -Wl,-read_only_relocs,suppress"
+ fi
+
+ AC_DEFINE([OC_X86ASM], [], [enable x86 assambler optimization])
+ AM_CONDITIONAL(OC_X86ASM,true)
+ ;;
+ x86_64)
+ cpu_x86_64=yes
+ cpu_optimization="64 bit x86"
+ AC_DEFINE([USE_ASM], [], [make use of asm optimization])
+ AC_DEFINE([OC_X86ASM], [], [enable x86 assambler optimization])
+ AM_CONDITIONAL(OC_X86ASM,true)
;;
esac
else
@@ -144,11 +144,11 @@
dnl Set extra linker options
case "$target_os" in
- linux* | solaris* )
- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
- ;;
- *)
- ;;
+ linux* | solaris* )
+ SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
+ ;;
+ *)
+ ;;
esac
THEORA_LDFLAGS="$THEORA_LDFLAGS SHLIB_VERSION_ARG"
fi
@@ -214,8 +214,8 @@
HAVE_SDL=no
AM_PATH_SDL(,[
- HAVE_SDL=yes
- SDL_LIBS=`$SDL_CONFIG --libs`
+ HAVE_SDL=yes
+ SDL_LIBS=`$SDL_CONFIG --libs`
],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***]))
dnl check for OSS
@@ -242,7 +242,7 @@
if test "x${ac_enable_float}" != xyes ; then
AC_DEFINE([THEORA_DISABLE_FLOAT], [],
- [Define to exclude floating point code from the build])
+ [Define to exclude floating point code from the build])
fi
AM_CONDITIONAL(THEORA_DISABLE_FLOAT, [test "x${ac_enable_float}" != xyes])
@@ -255,7 +255,7 @@
if test "x${ac_enable_encode}" != xyes ; then
AC_DEFINE([THEORA_DISABLE_ENCODE], [],
- [Define to exclude encode support from the build])
+ [Define to exclude encode support from the build])
else
if test x$HAVE_VORBIS = xyes; then
BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES encoder_example\$(EXEEXT)"
Modified: experimental/j/theora-mashup/lib/enc/dsp.c
===================================================================
--- experimental/j/theora-mashup/lib/enc/dsp.c 2007-04-09 18:08:48 UTC (rev 12840)
+++ experimental/j/theora-mashup/lib/enc/dsp.c 2007-04-09 18:14:16 UTC (rev 12841)
@@ -101,14 +101,14 @@
ogg_uint32_t SadValue1;
SadValue = DSP_OP_ABS_DIFF (Src1[0], Src2[0]) +
- DSP_OP_ABS_DIFF (Src1[1], Src2[1]) +
- DSP_OP_ABS_DIFF (Src1[2], Src2[2]) +
- DSP_OP_ABS_DIFF (Src1[3], Src2[3]);
+ DSP_OP_ABS_DIFF (Src1[1], Src2[1]) +
+ DSP_OP_ABS_DIFF (Src1[2], Src2[2]) +
+ DSP_OP_ABS_DIFF (Src1[3], Src2[3]);
SadValue1 = DSP_OP_ABS_DIFF (Src1[4], Src2[4]) +
- DSP_OP_ABS_DIFF (Src1[5], Src2[5]) +
- DSP_OP_ABS_DIFF (Src1[6], Src2[6]) +
- DSP_OP_ABS_DIFF (Src1[7], Src2[7]);
+ DSP_OP_ABS_DIFF (Src1[5], Src2[5]) +
+ DSP_OP_ABS_DIFF (Src1[6], Src2[6]) +
+ DSP_OP_ABS_DIFF (Src1[7], Src2[7]);
SadValue = ( SadValue > SadValue1 ) ? SadValue : SadValue1;
@@ -116,7 +116,7 @@
}
static ogg_uint32_t col_sad8x8__c (unsigned char *Src1, unsigned char *Src2,
- ogg_uint32_t stride)
+ ogg_uint32_t stride)
{
ogg_uint32_t SadValue[8] = {0,0,0,0,0,0,0,0};
ogg_uint32_t SadValue2[8] = {0,0,0,0,0,0,0,0};
@@ -162,7 +162,7 @@
}
static ogg_uint32_t sad8x8__c (unsigned char *ptr1, ogg_uint32_t stride1,
- unsigned char *ptr2, ogg_uint32_t stride2)
+ unsigned char *ptr2, ogg_uint32_t stride2)
{
ogg_uint32_t i;
ogg_uint32_t sad = 0;
@@ -186,8 +186,8 @@
}
static ogg_uint32_t sad8x8_thres__c (unsigned char *ptr1, ogg_uint32_t stride1,
- unsigned char *ptr2, ogg_uint32_t stride2,
- ogg_uint32_t thres)
+ unsigned char *ptr2, ogg_uint32_t stride2,
+ ogg_uint32_t thres)
{
ogg_uint32_t i;
ogg_uint32_t sad = 0;
@@ -214,9 +214,9 @@
}
static ogg_uint32_t sad8x8_xy2_thres__c (unsigned char *SrcData, ogg_uint32_t SrcStride,
- unsigned char *RefDataPtr1,
- unsigned char *RefDataPtr2, ogg_uint32_t RefStride,
- ogg_uint32_t thres)
+ unsigned char *RefDataPtr1,
+ unsigned char *RefDataPtr2, ogg_uint32_t RefStride,
+ ogg_uint32_t thres)
{
ogg_uint32_t i;
ogg_uint32_t sad = 0;
@@ -277,7 +277,7 @@
}
static ogg_uint32_t inter8x8_err__c (unsigned char *SrcData, ogg_uint32_t SrcStride,
- unsigned char *RefDataPtr, ogg_uint32_t RefStride)
+ unsigned char *RefDataPtr, ogg_uint32_t RefStride)
{
ogg_uint32_t i;
ogg_uint32_t XSum=0;
@@ -327,8 +327,8 @@
}
static ogg_uint32_t inter8x8_err_xy2__c (unsigned char *SrcData, ogg_uint32_t SrcStride,
- unsigned char *RefDataPtr1,
- unsigned char *RefDataPtr2, ogg_uint32_t RefStride)
+ unsigned char *RefDataPtr1,
+ unsigned char *RefDataPtr2, ogg_uint32_t RefStride)
{
ogg_uint32_t i;
ogg_uint32_t XSum=0;
Modified: experimental/j/theora-mashup/lib/enc/dsp.h
===================================================================
--- experimental/j/theora-mashup/lib/enc/dsp.h 2007-04-09 18:08:48 UTC (rev 12840)
+++ experimental/j/theora-mashup/lib/enc/dsp.h 2007-04-09 18:14:16 UTC (rev 12841)
@@ -26,59 +26,59 @@
void (*save_fpu) (void);
void (*restore_fpu) (void);
- void (*sub8x8) (unsigned char *FiltPtr, unsigned char *ReconPtr,
- ogg_int16_t *DctInputPtr, ogg_uint32_t PixelsPerLine,
- ogg_uint32_t ReconPixelsPerLine);
+ void (*sub8x8) (unsigned char *FiltPtr, unsigned char *ReconPtr,
+ ogg_int16_t *DctInputPtr, ogg_uint32_t PixelsPerLine,
+ ogg_uint32_t ReconPixelsPerLine);
- void (*sub8x8_128) (unsigned char *FiltPtr, ogg_int16_t *DctInputPtr,
- ogg_uint32_t PixelsPerLine);
+ void (*sub8x8_128) (unsigned char *FiltPtr, ogg_int16_t *DctInputPtr,
+ ogg_uint32_t PixelsPerLine);
- void (*sub8x8avg2) (unsigned char *FiltPtr, unsigned char *ReconPtr1,
- unsigned char *ReconPtr2, ogg_int16_t *DctInputPtr,
- ogg_uint32_t PixelsPerLine,
- ogg_uint32_t ReconPixelsPerLine);
+ void (*sub8x8avg2) (unsigned char *FiltPtr, unsigned char *ReconPtr1,
+ unsigned char *ReconPtr2, ogg_int16_t *DctInputPtr,
+ ogg_uint32_t PixelsPerLine,
+ ogg_uint32_t ReconPixelsPerLine);
- void (*copy8x8) (unsigned char *src, unsigned char *dest,
- ogg_uint32_t stride);
+ void (*copy8x8) (unsigned char *src, unsigned char *dest,
+ ogg_uint32_t stride);
- void (*recon_intra8x8) (unsigned char *ReconPtr, ogg_int16_t *ChangePtr,
- ogg_uint32_t LineStep);
+ void (*recon_intra8x8) (unsigned char *ReconPtr, ogg_int16_t *ChangePtr,
+ ogg_uint32_t LineStep);
- void (*recon_inter8x8) (unsigned char *ReconPtr, unsigned char *RefPtr,
- ogg_int16_t *ChangePtr, ogg_uint32_t LineStep);
+ void (*recon_inter8x8) (unsigned char *ReconPtr, unsigned char *RefPtr,
+ ogg_int16_t *ChangePtr, ogg_uint32_t LineStep);
- void (*recon_inter8x8_half) (unsigned char *ReconPtr, unsigned char *RefPtr1,
- unsigned char *RefPtr2, ogg_int16_t *ChangePtr,
- ogg_uint32_t LineStep);
+ void (*recon_inter8x8_half) (unsigned char *ReconPtr, unsigned char *RefPtr1,
+ unsigned char *RefPtr2, ogg_int16_t *ChangePtr,
+ ogg_uint32_t LineStep);
void (*fdct_short) (ogg_int16_t *InputData, ogg_int16_t *OutputData);
- ogg_uint32_t (*row_sad8) (unsigned char *Src1, unsigned char *Src2);
+ ogg_uint32_t (*row_sad8) (unsigned char *Src1, unsigned char *Src2);
- ogg_uint32_t (*col_sad8x8) (unsigned char *Src1, unsigned char *Src2,
- ogg_uint32_t stride);
+ ogg_uint32_t (*col_sad8x8) (unsigned char *Src1, unsigned char *Src2,
+ ogg_uint32_t stride);
- ogg_uint32_t (*sad8x8) (unsigned char *ptr1, ogg_uint32_t stride1,
- unsigned char *ptr2, ogg_uint32_t stride2);
+ ogg_uint32_t (*sad8x8) (unsigned char *ptr1, ogg_uint32_t stride1,
+ unsigned char *ptr2, ogg_uint32_t stride2);
- ogg_uint32_t (*sad8x8_thres) (unsigned char *ptr1, ogg_uint32_t stride1,
- unsigned char *ptr2, ogg_uint32_t stride2,
- ogg_uint32_t thres);
+ ogg_uint32_t (*sad8x8_thres) (unsigned char *ptr1, ogg_uint32_t stride1,
+ unsigned char *ptr2, ogg_uint32_t stride2,
+ ogg_uint32_t thres);
ogg_uint32_t (*sad8x8_xy2_thres)(unsigned char *SrcData, ogg_uint32_t SrcStride,
- unsigned char *RefDataPtr1,
- unsigned char *RefDataPtr2, ogg_uint32_t RefStride,
- ogg_uint32_t thres);
+ unsigned char *RefDataPtr1,
+ unsigned char *RefDataPtr2, ogg_uint32_t RefStride,
+ ogg_uint32_t thres);
- ogg_uint32_t (*intra8x8_err) (unsigned char *DataPtr, ogg_uint32_t Stride);
+ ogg_uint32_t (*intra8x8_err) (unsigned char *DataPtr, ogg_uint32_t Stride);
- ogg_uint32_t (*inter8x8_err) (unsigned char *SrcData, ogg_uint32_t SrcStride,
- unsigned char *RefDataPtr, ogg_uint32_t RefStride);
+ ogg_uint32_t (*inter8x8_err) (unsigned char *SrcData, ogg_uint32_t SrcStride,
+ unsigned char *RefDataPtr, ogg_uint32_t RefStride);
ogg_uint32_t (*inter8x8_err_xy2)(unsigned char *SrcData, ogg_uint32_t SrcStride,
- unsigned char *RefDataPtr1,
- unsigned char *RefDataPtr2, ogg_uint32_t RefStride);
-
+ unsigned char *RefDataPtr1,
+ unsigned char *RefDataPtr2, ogg_uint32_t RefStride);
+
void (*FilterHoriz) (unsigned char * PixelPtr,
ogg_int32_t LineLength, ogg_int16_t *BoundingValuePtr);
@@ -126,10 +126,10 @@
#define dsp_recon_intra8x8(funcs,ptr1,ptr2,str1) (funcs.recon_intra8x8 (ptr1,ptr2,str1))
#define dsp_recon_inter8x8(funcs,ptr1,ptr2,ptr3,str1) \
- (funcs.recon_inter8x8 (ptr1,ptr2,ptr3,str1))
+ (funcs.recon_inter8x8 (ptr1,ptr2,ptr3,str1))
#define dsp_recon_inter8x8_half(funcs,ptr1,ptr2,ptr3,ptr4,str1) \
- (funcs.recon_inter8x8_half (ptr1,ptr2,ptr3,ptr4,str1))
+ (funcs.recon_inter8x8_half (ptr1,ptr2,ptr3,ptr4,str1))
#define dsp_fdct_short(funcs,in,out) (funcs.fdct_short (in,out))
@@ -142,15 +142,15 @@
#define dsp_sad8x8_thres(funcs,ptr1,str1,ptr2,str2,t) (funcs.sad8x8_thres (ptr1,str1,ptr2,str2,t))
#define dsp_sad8x8_xy2_thres(funcs,ptr1,str1,ptr2,ptr3,str2,t) \
- (funcs.sad8x8_xy2_thres (ptr1,str1,ptr2,ptr3,str2,t))
+ (funcs.sad8x8_xy2_thres (ptr1,str1,ptr2,ptr3,str2,t))
#define dsp_intra8x8_err(funcs,ptr1,str1) (funcs.intra8x8_err (ptr1,str1))
#define dsp_inter8x8_err(funcs,ptr1,str1,ptr2,str2) \
- (funcs.inter8x8_err (ptr1,str1,ptr2,str2))
+ (funcs.inter8x8_err (ptr1,str1,ptr2,str2))
#define dsp_inter8x8_err_xy2(funcs,ptr1,str1,ptr2,ptr3,str2) \
- (funcs.inter8x8_err_xy2 (ptr1,str1,ptr2,ptr3,str2))
+ (funcs.inter8x8_err_xy2 (ptr1,str1,ptr2,ptr3,str2))
#define dsp_FilterHoriz(funcs, ptr1, ptr2, ptr3) \
(funcs.FilterHoriz(ptr1, ptr2, ptr3))
Modified: experimental/j/theora-mashup/lib/enc/mcomp.c
===================================================================
--- experimental/j/theora-mashup/lib/enc/mcomp.c 2007-04-09 18:08:48 UTC (rev 12840)
+++ experimental/j/theora-mashup/lib/enc/mcomp.c 2007-04-09 18:14:16 UTC (rev 12841)
@@ -108,11 +108,11 @@
second reference pointer */
if ( RefOffset == 0 ) {
DiffVal = dsp_inter8x8_err (cpi->dsp, NewDataPtr, PixelsPerLine,
- RefDataPtr1, RefPixelsPerLine);
+ RefDataPtr1, RefPixelsPerLine);
}else{
DiffVal = dsp_inter8x8_err_xy2 (cpi->dsp, NewDataPtr, PixelsPerLine,
- RefDataPtr1,
- RefDataPtr2, RefPixelsPerLine);
+ RefDataPtr1,
+ RefDataPtr2, RefPixelsPerLine);
}
/* Compute and return population variance as mis-match metric. */
@@ -134,11 +134,11 @@
if ( RefOffset == 0 ) {
/* Simple case as for non 0.5 pixel */
DiffVal += dsp_sad8x8 (cpi->dsp, SrcData, PixelsPerLine,
- RefDataPtr1, RefPixelsPerLine);
+ RefDataPtr1, RefPixelsPerLine);
} else {
DiffVal += dsp_sad8x8_xy2_thres (cpi->dsp, SrcData, PixelsPerLine,
- RefDataPtr1,
- RefDataPtr2, RefPixelsPerLine, BestSoFar);
+ RefDataPtr1,
+ RefDataPtr2, RefPixelsPerLine, BestSoFar);
}
return DiffVal;
Modified: experimental/j/theora-mashup/lib/enc/reconstruct.c
===================================================================
--- experimental/j/theora-mashup/lib/enc/reconstruct.c 2007-04-09 18:08:48 UTC (rev 12840)
+++ experimental/j/theora-mashup/lib/enc/reconstruct.c 2007-04-09 18:14:16 UTC (rev 12841)
@@ -18,8 +18,8 @@
#include "codec_internal.h"
static void copy8x8__c (unsigned char *src,
- unsigned char *dest,
- unsigned int stride)
+ unsigned char *dest,
+ unsigned int stride)
{
int j;
for ( j = 0; j < 8; j++ ){
@@ -31,7 +31,7 @@
}
static void recon_intra8x8__c (unsigned char *ReconPtr, ogg_int16_t *ChangePtr,
- ogg_uint32_t LineStep)
+ ogg_uint32_t LineStep)
{
ogg_uint32_t i;
@@ -53,7 +53,7 @@
}
static void recon_inter8x8__c (unsigned char *ReconPtr, unsigned char *RefPtr,
- ogg_int16_t *ChangePtr, ogg_uint32_t LineStep)
+ ogg_int16_t *ChangePtr, ogg_uint32_t LineStep)
{
ogg_uint32_t i;
@@ -74,8 +74,8 @@
}
static void recon_inter8x8_half__c (unsigned char *ReconPtr, unsigned char *RefPtr1,
- unsigned char *RefPtr2, ogg_int16_t *ChangePtr,
- ogg_uint32_t LineStep)
+ unsigned char *RefPtr2, ogg_int16_t *ChangePtr,
+ ogg_uint32_t LineStep)
{
ogg_uint32_t i;
More information about the commits
mailing list