[x265] [PATCH 2 of 8] clarify 8bit/10bit in code comments

Steve Borho steve at borho.org
Tue Jun 23 05:03:53 CEST 2015


# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1435022545 18000
#      Mon Jun 22 20:22:25 2015 -0500
# Node ID 78c562d38eea28d7b99cbb8ff4a228440c50ca2c
# Parent  d5376bf40aeab3eece8504045cbc603a145788b5
clarify 8bit/10bit in code comments

diff -r d5376bf40aea -r 78c562d38eea source/CMakeLists.txt
--- a/source/CMakeLists.txt	Mon Jun 22 20:11:24 2015 -0500
+++ b/source/CMakeLists.txt	Mon Jun 22 20:22:25 2015 -0500
@@ -276,7 +276,7 @@
 
 if(X64)
     # NOTE: We only officially support 16bit-per-pixel compiles of x265
-    # on 64bit architectures. 16bpp plus large resolution plus slow
+    # on 64bit architectures. Main10 plus large resolution plus slow
     # preset plus 32bit address space usually means malloc failure.  You
     # can disable this if(X64) check if you desparately need a 32bit
     # build with 10bit/12bit support, but this violates the "shrink wrap
diff -r d5376bf40aea -r 78c562d38eea source/common/quant.h
--- a/source/common/quant.h	Mon Jun 22 20:11:24 2015 -0500
+++ b/source/common/quant.h	Mon Jun 22 20:22:25 2015 -0500
@@ -41,7 +41,7 @@
     int per;
     int qp;
     int64_t lambda2; /* FIX8 */
-    int32_t lambda;  /* FIX8, dynamic range is 18-bits in 8bpp and 20-bits in 16bpp */
+    int32_t lambda;  /* FIX8, dynamic range is 18-bits in Main and 20-bits in Main10 */
 
     QpParam() : qp(MAX_INT) {}
 
diff -r d5376bf40aea -r 78c562d38eea source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Mon Jun 22 20:11:24 2015 -0500
+++ b/source/common/x86/asm-primitives.cpp	Mon Jun 22 20:22:25 2015 -0500
@@ -871,7 +871,7 @@
 
 #if HIGH_BIT_DEPTH
 
-void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask) // 16bpp
+void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask) // Main10
 {
 #if !defined(X86_64)
 #error "Unsupported build configuration (32bit x86 and HIGH_BIT_DEPTH), you must configure ENABLE_ASSEMBLY=OFF"
@@ -2077,7 +2077,7 @@
 }
 #else // if HIGH_BIT_DEPTH
 
-void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask) // 8bpp
+void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask) // Main
 {
 #if X86_64
     p.scanPosLast = PFX(scanPosLast_x64);
diff -r d5376bf40aea -r 78c562d38eea source/common/x86/pixel-a.asm
--- a/source/common/x86/pixel-a.asm	Mon Jun 22 20:11:24 2015 -0500
+++ b/source/common/x86/pixel-a.asm	Mon Jun 22 20:22:25 2015 -0500
@@ -7089,7 +7089,7 @@
 %endif ; ARCH_X86_64=1
 %endif ; HIGH_BIT_DEPTH
 
-; Input 16bpp, Output 8bpp
+; Input 10bit, Output 8bit
 ;------------------------------------------------------------------------------------------------------------------------
 ;void planecopy_sp(uint16_t *src, intptr_t srcStride, pixel *dst, intptr_t dstStride, int width, int height, int shift, uint16_t mask)
 ;------------------------------------------------------------------------------------------------------------------------
@@ -7183,7 +7183,7 @@
 .end:
     RET
 
-; Input 16bpp, Output 8bpp
+; Input 10bit, Output 8bit
 ;-------------------------------------------------------------------------------------------------------------------------------------
 ;void planecopy_sp(uint16_t *src, intptr_t srcStride, pixel *dst, intptr_t dstStride, int width, int height, int shift, uint16_t mask)
 ;-------------------------------------------------------------------------------------------------------------------------------------
@@ -7294,7 +7294,7 @@
 .end:
     RET
 
-; Input 8bpp, Output 16bpp
+; Input 8bit, Output 10bit
 ;---------------------------------------------------------------------------------------------------------------------
 ;void planecopy_cp(uint8_t *src, intptr_t srcStride, pixel *dst, intptr_t dstStride, int width, int height, int shift)
 ;---------------------------------------------------------------------------------------------------------------------
diff -r d5376bf40aea -r 78c562d38eea source/x265.h
--- a/source/x265.h	Mon Jun 22 20:11:24 2015 -0500
+++ b/source/x265.h	Mon Jun 22 20:22:25 2015 -0500
@@ -1318,8 +1318,8 @@
 /* === Multi-lib API ===
  * By using this method to gain access to the libx265 interfaces, you allow run-
  * time selection between various available libx265 libraries based on the
- * encoder parameters. The most likely use case is to choose between 8bpp and
- * 16bpp builds of libx265. */
+ * encoder parameters. The most likely use case is to choose between Main and
+ * Main10 builds of libx265. */
 
 typedef struct x265_api
 {


More information about the x265-devel mailing list