[x265] [PATCH] entropy: refine check failures

[deepthi at multicorewareinc.com]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1423822769 -19800
#      Fri Feb 13 15:49:29 2015 +0530
# Node ID 590207249d28cbcc1e7946185d6cf00fb9c56de1
# Parent  177e5fbbc3b40266ef5bfb504ae8c862fba2b9ed
entropy: refine check failures

diff -r 177e5fbbc3b4 -r 590207249d28 source/encoder/entropy.cpp
--- a/source/encoder/entropy.cpp	Fri Feb 13 14:14:59 2015 +0530
+++ b/source/encoder/entropy.cpp	Fri Feb 13 15:49:29 2015 +0530
@@ -690,12 +690,11 @@
 
     /* in each of these conditions, the subdiv flag is implied and not signaled,
      * so we have checks to make sure the implied value matches our intentions */
-    if (cu.isIntra(absPartIdx) && cu.m_partSize[absPartIdx] != SIZE_2Nx2N && !curDepth)
+    if (cu.isIntra(absPartIdx) && cu.m_partSize[absPartIdx] != SIZE_2Nx2N && log2CurSize == MIN_LOG2_CU_SIZE)
     {
         X265_CHECK(subdiv, "intra NxN requires TU depth below CU depth\n");
     }
-    else if (cu.isInter(absPartIdx) && cu.m_partSize[absPartIdx] != SIZE_2Nx2N &&
-             !curDepth && cu.m_slice->m_sps->quadtreeTUMaxDepthInter == 1)
+    else if (cu.isInter(absPartIdx) && cu.m_partSize[absPartIdx] != SIZE_2Nx2N)
     {
         X265_CHECK(subdiv, "inter TU must be smaller than CU when not 2Nx2N part size: log2CurSize %d, depthRange[0] %d\n", log2CurSize, depthRange[0]);
     }