changeset 9540:8a9989b5b1ed draft

Merge with public
author Praveen Tiwari <praveen@multicorewareinc.com>
date Wed, 18 Feb 2015 10:31:48 +0530
parents 7d20d3a40bba (current diff) 89f5e1f88d40 (diff)
children bcb623bffca4
files source/common/x86/blockcopy8.asm source/encoder/entropy.cpp
diffstat 3 files changed, 11 insertions(+-), 10 deletions(-) [+]
line wrap: on
line diff
--- a/source/common/x86/blockcopy8.asm	Tue Feb 17 17:46:00 2015 +0530
+++ b/source/common/x86/blockcopy8.asm	Wed Feb 18 10:31:48 2015 +0530
@@ -5599,7 +5599,7 @@ INIT_XMM sse2
 cglobal cpy1Dto2D_shr_4, 3, 3, 4
     add         r2d, r2d
     movd        m0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, m0
     psraw       m1, 1
 
@@ -5622,7 +5622,7 @@ INIT_YMM avx2
 cglobal cpy1Dto2D_shr_4, 3, 3, 3
     add         r2d, r2d
     movd        xm0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, xm0
     psraw       m1, 1
 
@@ -5646,7 +5646,7 @@ INIT_XMM sse2
 cglobal cpy1Dto2D_shr_8, 3, 4, 6
     add         r2d, r2d
     movd        m0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, m0
     psraw       m1, 1
     lea         r3, [r2 * 3]
@@ -5694,7 +5694,7 @@ INIT_YMM avx2
 cglobal cpy1Dto2D_shr_8, 3, 4, 4
     add         r2d, r2d
     movd        xm0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, xm0
     psraw       m1, 1
     lea         r3, [r2 * 3]
@@ -5733,7 +5733,7 @@ INIT_XMM sse2
 cglobal cpy1Dto2D_shr_16, 3, 5, 6
     add         r2d, r2d
     movd        m0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, m0
     psraw       m1, 1
     mov         r3d, 16/4
@@ -5787,7 +5787,7 @@ INIT_YMM avx2
 cglobal cpy1Dto2D_shr_16, 3, 5, 4
     add         r2d, r2d
     movd        xm0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, xm0
     psraw       m1, 1
     mov         r3d, 16/4
@@ -5828,7 +5828,7 @@ INIT_XMM sse2
 cglobal cpy1Dto2D_shr_32, 3, 4, 6
     add         r2d, r2d
     movd        m0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, m0
     psraw       m1, 1
     mov         r3d, 32/2
@@ -5881,7 +5881,7 @@ INIT_YMM avx2
 cglobal cpy1Dto2D_shr_32, 3, 4, 6
     add         r2d, r2d
     movd        xm0, r3m
-    pcmpeqw	m1, m1
+    pcmpeqw     m1, m1
     psllw       m1, xm0
     psraw       m1, 1
     mov         r3d, 32/2
--- a/source/encoder/entropy.cpp	Tue Feb 17 17:46:00 2015 +0530
+++ b/source/encoder/entropy.cpp	Wed Feb 18 10:31:48 2015 +0530
@@ -694,7 +694,8 @@ void Entropy::encodeTransform(const CUDa
     {
         X265_CHECK(subdiv, "intra NxN requires TU depth below CU depth\n");
     }
-    else if (cu.isInter(absPartIdx) && cu.m_partSize[absPartIdx] != SIZE_2Nx2N)
+    else if (cu.isInter(absPartIdx) && cu.m_partSize[absPartIdx] != SIZE_2Nx2N &&
+             !curDepth && cu.m_slice->m_sps->quadtreeTUMaxDepthInter == 1)
     {
         X265_CHECK(subdiv, "inter TU must be smaller than CU when not 2Nx2N part size: log2CurSize %d, depthRange[0] %d\n", log2CurSize, depthRange[0]);
     }
--- a/source/encoder/search.cpp	Tue Feb 17 17:46:00 2015 +0530
+++ b/source/encoder/search.cpp	Wed Feb 18 10:31:48 2015 +0530
@@ -1697,7 +1697,7 @@ uint32_t Search::estIntraPredChromaQT(Mo
         uint32_t maxMode = NUM_CHROMA_MODE;
         uint32_t modeList[NUM_CHROMA_MODE];
 
-        if (sharedChromaModes)
+        if (sharedChromaModes && !initTuDepth)
         {
             for (uint32_t l = 0; l < NUM_CHROMA_MODE; l++)
                 modeList[l] = sharedChromaModes[0];