Merge branch 'develop'

Adds bugfixes for a number of issues detected in bit_packing.cpp
stian-svedenborg · Oct 25, 2015 · bb0b3fc · bb0b3fc
2 parents 6df1a1c + 4bf2d5c
commit bb0b3fc
Show file tree

Hide file tree

Showing 16 changed files with 600 additions and 114 deletions.
diff --git a/formats/px_fmt/ARGB8888 b/formats/px_fmt/ARGB8888
@@ -0,0 +1,86 @@
+##########################################
+#                RGBA8888                #
+##########################################
+# Byte order of RGBA8888 is:
+# Low byte: A
+# Next increasing byte address: R
+# Next increasing byte address: G
+# Next increasing byte address: B
+##########################################
+
+{
+    "fourcc" : "",
+
+    "licence" : {
+        "type" : "no_licence"
+    },
+
+    "origin" : "upper_left",
+
+    "subsampling_mode" : {
+        "macro_px_w" : 1,
+        "macro_px_h" : 1
+    },
+
+    "planes" : [
+        {
+            "base_offset"  : "0",
+            "line_stride"  : "image_w*32/8",
+            "plane_size"   : "line_stride*image_h",
+            "block_stride" : 32,
+            "interleave_pattern" : "NO_INTERLEAVING"
+        }
+    ],
+
+    "y_block" : {
+        "block_w" : 1,
+        "block_h" : 1,
+        "samples" : [
+            {
+                "plane" : 0,
+                "int_bits" : 8,
+                "frac_bits" : 0,
+                "offset" : 8
+            }
+        ]
+    },
+
+    "u_block" : {
+        "block_w" : 1,
+        "block_h" : 1,
+        "samples" : [
+            {
+                "plane" : 0,
+                "int_bits" : 8,
+                "frac_bits" : 0,
+                "offset" : 16
+            }
+        ]
+    },
+
+    "v_block" : {
+        "block_w" : 1,
+        "block_h" : 1,
+        "samples" : [
+            {
+                "plane" : 0,
+                "int_bits" : 8,
+                "frac_bits" : 0,
+                "offset" : 24
+            }
+        ]
+    },
+
+    "a_block" : {
+        "block_w" : 1,
+        "block_h" : 1,
+        "samples" : [
+            {
+                "plane" : 0,
+                "int_bits" : 8,
+                "frac_bits" : 0,
+                "offset" : 0
+            }
+        ]
+    }
+}
diff --git a/formats/px_fmt/RGBA8888 b/formats/px_fmt/RGBA8888
@@ -1,7 +1,11 @@
 ##########################################
 #                RGBA8888                #
 ##########################################
-#
+# Byte order of RGBA8888 is:
+# Low byte: R
+# Next increasing byte address: G
+# Next increasing byte address: B
+# Next increasing byte address: A
 ##########################################
 
 {
@@ -36,7 +40,7 @@
                 "plane" : 0,
                 "int_bits" : 8,
                 "frac_bits" : 0,
-                "offset" : 8
+                "offset" : 0
             }
         ]
     },
@@ -49,7 +53,7 @@
                 "plane" : 0,
                 "int_bits" : 8,
                 "frac_bits" : 0,
-                "offset" : 16
+                "offset" : 8
             }
         ]
     },
@@ -62,7 +66,7 @@
                 "plane" : 0,
                 "int_bits" : 8,
                 "frac_bits" : 0,
-                "offset" : 24
+                "offset" : 16
             }
         ]
     },
@@ -75,8 +79,8 @@
                 "plane" : 0,
                 "int_bits" : 8,
                 "frac_bits" : 0,
-                "offset" : 0
+                "offset" : 24
             }
         ]
     }
-}
+}
diff --git a/formats/rgb_conversion/bt601 b/formats/rgb_conversion/bt601
@@ -37,8 +37,8 @@
     # i.e. fractional bits will not be affected. (This allows us to use the same constants to encode for instance
     # 10-bit studio range, where the last two bits are fractional).
 
-    "y_packed_range" : [ 0.062745098, 0.921568627],
-    "u_packed_range" : [ 0.062745098, 0.941176471],
-    "v_packed_range" : [ 0.062745098, 0.941176471]
+    "y_packed_range" : [ 0.062745098, 0.921568627 ],
+    "u_packed_range" : [ 0.062745098, 0.941176471 ],
+    "v_packed_range" : [ 0.062745098, 0.941176471 ]
 
 }
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -17,7 +17,7 @@ add_executable(unit_tests
     TestResources.h
     continuation_blocks.cpp
     interleave_test.cpp
-)
+        bit_packing.cpp)