[x264-devel] commit: cosmetics (Loren Merritt )
git version control
git at videolan.org
Wed Jun 4 00:53:49 CEST 2008
x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Mon Jun 2 09:47:50 2008 -0600| [ea2648b34da352de8c2e52aa657c83bf28ec0f21]
cosmetics
> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=ea2648b34da352de8c2e52aa657c83bf28ec0f21
---
common/osdep.h | 2 +-
common/ppc/pixel.h | 2 +-
common/predict.c | 6 +++---
common/x86/mc-a.asm | 2 +-
common/x86/mc-a2.asm | 36 ++++++++++++++++++------------------
common/x86/pixel.h | 2 +-
encoder/analyse.c | 9 +--------
encoder/encoder.c | 2 +-
tools/.cvsignore | 2 --
x264.h | 2 +-
10 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/common/osdep.h b/common/osdep.h
index 18c7c48..c3c8149 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * common.h: h264 encoder
+ * osdep.h: h264 encoder
*****************************************************************************
* Copyright (C) 2007 x264 project
*
diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h
index b62e3a7..e1925b3 100644
--- a/common/ppc/pixel.h
+++ b/common/ppc/pixel.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * mc.h: h264 encoder library
+ * pixel.h: h264 encoder library
*****************************************************************************
* Copyright (C) 2003 Laurent Aimar
* $Id: pixel.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $
diff --git a/common/predict.c b/common/predict.c
index 9d9b901..d253879 100644
--- a/common/predict.c
+++ b/common/predict.c
@@ -707,9 +707,9 @@ static void predict_8x8_hd( uint8_t *src, uint8_t edge[33] )
int p6 = pack8to16(F1(l1,l2), F2(l0,l1,l2));
int p7 = pack8to16(F1(l0,l1), F2(lt,l0,l1));
int p8 = pack8to16(F1(lt,l0), F2(l0,lt,t0));
- int p9 = pack8to16(F2(t1,t0,lt), F2(t2,t1,t0 ));
- int p10 = pack8to16(F2(t3,t2,t1), F2(t4,t3,t2 ));
- int p11 = pack8to16(F2(t5,t4,t3), F2(t6,t5,t4 ));
+ int p9 = pack8to16(F2(t1,t0,lt), F2(t2,t1,t0));
+ int p10 = pack8to16(F2(t3,t2,t1), F2(t4,t3,t2));
+ int p11 = pack8to16(F2(t5,t4,t3), F2(t6,t5,t4));
SRC32(0,7)= pack16to32(p1,p2);
SRC32(0,6)= pack16to32(p2,p3);
SRC32(4,7)=SRC32(0,5)= pack16to32(p3,p4);
diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm
index bbf8539..eadb6b5 100644
--- a/common/x86/mc-a.asm
+++ b/common/x86/mc-a.asm
@@ -408,7 +408,7 @@ AVG_CACHELINE_CHECK 20, 64, sse2
; uint8_t *src, int i_src_stride, int i_height )
;-----------------------------------------------------------------------------
cglobal x264_mc_copy_w4_mmx, 4,6
- cmp r4m, dword 4
+ cmp dword r4m, 4
lea r5, [r3*3]
lea r4, [r1*3]
je .end
diff --git a/common/x86/mc-a2.asm b/common/x86/mc-a2.asm
index df30d23..606fa14 100644
--- a/common/x86/mc-a2.asm
+++ b/common/x86/mc-a2.asm
@@ -405,15 +405,15 @@ cglobal x264_memcpy_aligned_mmx, 3,3
movq [r0 + r2 + 0], mm0
movq [r0 + r2 + 8], mm1
.copy32:
- sub r2d, 32
- movq mm0, [r1 + r2 + 0]
- movq mm1, [r1 + r2 + 8]
- movq mm2, [r1 + r2 + 16]
- movq mm3, [r1 + r2 + 24]
- movq [r0 + r2 + 0], mm0
- movq [r0 + r2 + 8], mm1
- movq [r0 + r2 + 16], mm2
- movq [r0 + r2 + 24], mm3
+ sub r2d, 32
+ movq mm0, [r1 + r2 + 0]
+ movq mm1, [r1 + r2 + 8]
+ movq mm2, [r1 + r2 + 16]
+ movq mm3, [r1 + r2 + 24]
+ movq [r0 + r2 + 0], mm0
+ movq [r0 + r2 + 8], mm1
+ movq [r0 + r2 + 16], mm2
+ movq [r0 + r2 + 24], mm3
jg .copy32
REP_RET
@@ -435,15 +435,15 @@ cglobal x264_memcpy_aligned_sse2, 3,3
movdqa xmm1, [r1 + r2 + 16]
movdqa [r0 + r2 + 16], xmm1
.copy64:
- sub r2d, 64
- movdqa xmm0, [r1 + r2 + 0]
- movdqa [r0 + r2 + 0], xmm0
- movdqa xmm1, [r1 + r2 + 16]
- movdqa [r0 + r2 + 16], xmm1
- movdqa xmm2, [r1 + r2 + 32]
- movdqa [r0 + r2 + 32], xmm2
- movdqa xmm3, [r1 + r2 + 48]
- movdqa [r0 + r2 + 48], xmm3
+ sub r2d, 64
+ movdqa xmm0, [r1 + r2 + 0]
+ movdqa [r0 + r2 + 0], xmm0
+ movdqa xmm1, [r1 + r2 + 16]
+ movdqa [r0 + r2 + 16], xmm1
+ movdqa xmm2, [r1 + r2 + 32]
+ movdqa [r0 + r2 + 32], xmm2
+ movdqa xmm3, [r1 + r2 + 48]
+ movdqa [r0 + r2 + 48], xmm3
jg .copy64
REP_RET
diff --git a/common/x86/pixel.h b/common/x86/pixel.h
index fcacaf2..92adfbf 100644
--- a/common/x86/pixel.h
+++ b/common/x86/pixel.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * mc.h: h264 encoder library
+ * pixel.h: h264 encoder library
*****************************************************************************
* Copyright (C) 2003-2008 Laurent Aimar
*
diff --git a/encoder/analyse.c b/encoder/analyse.c
index 24d594a..0d3831a 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -2386,15 +2386,8 @@ void x264_macroblock_analyse( x264_t *h )
else if( analysis.b_mbrd )
{
i_bskip_cost = ssd_mb( h );
-
/* 6 = minimum cavlc cost of a non-skipped MB */
- if( i_bskip_cost <= ((6 * analysis.i_lambda2 + 128) >> 8) )
- {
- h->mb.i_type = B_SKIP;
- x264_analyse_update_cache( h, &analysis );
- h->mb.b_skip_mc = 1;
- return;
- }
+ b_skip = h->mb.b_skip_mc = i_bskip_cost <= ((6 * analysis.i_lambda2 + 128) >> 8);
}
else if( !h->mb.b_direct_auto_write )
{
diff --git a/encoder/encoder.c b/encoder/encoder.c
index 518e960..636daa8 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -1729,7 +1729,7 @@ void x264_encoder_close ( x264_t *h )
for( i=0; i<h->param.i_threads; i++ )
{
- // don't strictly have to wait for the other threads, but it's simpler than cancelling them
+ // don't strictly have to wait for the other threads, but it's simpler than canceling them
if( h->thread[i]->b_thread_active )
x264_pthread_join( h->thread[i]->thread_handle, NULL );
}
diff --git a/tools/.cvsignore b/tools/.cvsignore
deleted file mode 100644
index bafdf1a..0000000
--- a/tools/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-xyuv
-avc2avi
diff --git a/x264.h b/x264.h
index c41d6f0..ff4cc24 100644
--- a/x264.h
+++ b/x264.h
@@ -55,7 +55,7 @@ typedef struct x264_t x264_t;
#define X264_CPU_ALTIVEC 0x000040 /* altivec */
#define X264_CPU_SSE3 0x000080 /* sse 3 */
#define X264_CPU_SSSE3 0x000100 /* ssse 3 */
-#define X264_CPU_CACHELINE_SPLIT 0x200 /* avoid memory loads that span the boder between two cachelines */
+#define X264_CPU_CACHELINE_SPLIT 0x200 /* avoid memory loads that span the border between two cachelines */
#define X264_CPU_CACHELINE_32 0x0400 /* size of a cacheline in bytes */
#define X264_CPU_CACHELINE_64 0x0800
More information about the x264-devel
mailing list