changeset 361:6de9d7e911b6

Merged multicoreware/xhevc into default
author Deepthi Devaki Akkoorath <deepthidevaki@multicorewareinc.com>
date Fri, 05 Apr 2013 16:28:37 +0530
parents ad257e35e970 (current diff) 9aaf8e56f457 (diff)
children ffb382a731cb
files
diffstat 1 files changed, 21 insertions(+-), 8 deletions(-) [+]
line wrap: on
line diff
--- a/source/encoder/primitives.cpp	Fri Apr 05 16:27:28 2013 +0530
+++ b/source/encoder/primitives.cpp	Fri Apr 05 16:28:37 2013 +0530
@@ -31,17 +31,30 @@
 namespace x265 {
 // x265 private namespace
 
-static int8_t psize[8][8] =
+static int8_t psize[16][16] =
 {
     // 4, 8, 12, 16, 20, 24, 28, 32
-    { PARTITION_4x4, PARTITION_4x8, -1, PARTITION_4x16, -1, -1, -1, PARTITION_4x32},
-    { PARTITION_8x4, PARTITION_8x8, -1, PARTITION_8x16, -1, -1, -1, PARTITION_8x32},
+    { PARTITION_4x4, PARTITION_4x8, -1, PARTITION_4x16, -1, -1, -1, PARTITION_4x32
+      -1, -1, -1, -1, -1, -1, -1, PARTITION_4x64},
+    { PARTITION_8x4, PARTITION_8x8, -1, PARTITION_8x16, -1, -1, -1, PARTITION_8x32,
+      -1, -1, -1, -1, -1, -1, -1, PARTITION_8x64},
     { -1, -1, -1, -1, -1, -1, -1, -1 , -1},
-    { PARTITION_16x4, PARTITION_16x8, -1, PARTITION_16x16, -1, -1, -1, PARTITION_16x32},
-    { -1, -1, -1, -1, -1, -1, -1, -1},
-    { -1, -1, -1, -1, -1, -1, -1, -1},
-    { -1, -1, -1, -1, -1, -1, -1, -1},
-    { PARTITION_32x4, PARTITION_32x8, -1, PARTITION_32x16, -1, -1, -1, PARTITION_32x32},
+    { PARTITION_16x4, PARTITION_16x8, -1, PARTITION_16x16, -1, -1, -1, PARTITION_16x32,
+      -1, -1, -1, -1, -1, -1, -1, PARTITION_16x64},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { PARTITION_32x4, PARTITION_32x8, -1, PARTITION_32x16, -1, -1, -1, PARTITION_32x32,
+      -1, -1, -1, -1, -1, -1, -1, PARTITION_32x64},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+    { PARTITION_64x4, PARTITION_64x8, -1, PARTITION_64x16, -1, -1, -1, PARTITION_64x32,
+      -1, -1, -1, -1, -1, -1, -1, PARTITION_64x64}
 };
 
 // Returns a Partitions enum if the size matches a supported performance primitive,