[x264-devel] Minor fixes

Jason Garrett-Glaser git at videolan.org
Wed Apr 13 04:04:27 CEST 2011


x264 | branch: master | Jason Garrett-Glaser <jason at x264.com> | Sun Apr  3 16:31:52 2011 -0700| [e9e74e9e55ba645801e021665c1df1e72098e71e] | committer: Jason Garrett-Glaser

Minor fixes
Fix a comment typo.
Align an array properly.
Make x264_scan8 unsigned: saves a bunch of movsxd instructions on x86_64.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=e9e74e9e55ba645801e021665c1df1e72098e71e
---

 common/common.h |    2 +-
 common/set.c    |    2 +-
 encoder/me.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/common.h b/common/common.h
index f2021b6..fcf0250 100644
--- a/common/common.h
+++ b/common/common.h
@@ -137,7 +137,7 @@ typedef union { x264_uint128_t i; uint64_t a[2]; uint32_t b[4]; uint16_t c[8]; u
 #define X264_SCAN8_LUMA_SIZE (5*8)
 #define X264_SCAN8_0 (4+1*8)
 
-static const int x264_scan8[16+2*4+3] =
+static const unsigned x264_scan8[16+2*4+3] =
 {
     /* Luma */
     4+1*8, 5+1*8, 4+2*8, 5+2*8,
diff --git a/common/set.c b/common/set.c
index f8f6a11..f967fd8 100644
--- a/common/set.c
+++ b/common/set.c
@@ -195,7 +195,7 @@ int x264_cqm_init( x264_t *h )
             int dct8x8 = cat == 1;
             int size = dct8x8 ? 64 : 16;
             udctcoef *nr_offset = h->nr_offset_emergency[q][cat];
-            /* Denoise chroma first (due to h264's chroma QP offset, then luma, then DC. */
+            /* Denoise chroma first (due to h264's chroma QP offset), then luma, then DC. */
             int dc_threshold =    (QP_MAX-QP_MAX_SPEC)*2/3;
             int luma_threshold =  (QP_MAX-QP_MAX_SPEC)*2/3;
             int chroma_threshold = 0;
diff --git a/encoder/me.c b/encoder/me.c
index d5544f3..54de887 100644
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -965,7 +965,7 @@ static void ALWAYS_INLINE x264_me_refine_bidir( x264_t *h, x264_me_t *m0, x264_m
     /* each byte of visited represents 8 possible m1y positions, so a 4D array isn't needed */
     ALIGNED_ARRAY_16( uint8_t, visited,[8],[8][8] );
     /* all permutations of an offset in up to 2 of the dimensions */
-    static const int8_t dia4d[33][4] =
+    ALIGNED_4( static const int8_t dia4d[33][4] ) =
     {
         {0,0,0,0},
         {0,0,0,1}, {0,0,0,-1}, {0,0,1,0}, {0,0,-1,0},



More information about the x264-devel mailing list