smart_ass 0.1.0 → 0.2.0

data/lib/smart_ass/bt709_colormatrix.rb

@@ -2,8 +2,4 @@ class SmartAss::BT709ColorMatrix < SmartAss::YCbCrColorMatrix
   def initialize
     super(0.2126, 0.7152, 0.0722)
   end
-
-  def offset_vector
-    Matrix.column_vector([22.0, 125.0, 125.0])
-  end
 end

data/lib/smart_ass/rgba_color.rb

@@ -2,15 +2,25 @@ class SmartAss::RGBAColor
   attr_reader :r, :g, :b, :a
 
   def self.from_ass(string)
-    argb_hex = string.gsub(/^&H/, '')
-    components = argb_hex.scan(/.{2}/).map {|h| h.to_i(16)}
-    if components.size == 4
-      from_argb(*components)
+    abgr_hex   = string.gsub(/^&H/, '')
+    components = abgr_hex.scan(/.{2}/).map {|h| h.to_i(16)}
+
+    if components.size >= 4
+      from_abgr(*components)
     else
-      from_rgba(*components)
+      from_bgr(*components)
     end
   end
 
+  def self.from_abgr(*components)
+    argb = [components[0], components[1..3].reverse].flatten
+    from_argb(*argb)
+  end
+
+  def self.from_bgr(*components)
+    from_rgba(*components.reverse)
+  end
+
   def self.from_argb(*components)
     from_rgba(*components.push(components.shift))
   end
@@ -20,7 +30,7 @@ class SmartAss::RGBAColor
   end
 
   def to_ass
-    hex = argb_components
+    hex = abgr_components
       .map {|c| c.to_s(16)}
       .map {|c| c.rjust(2, "0")}
       .map(&:upcase)
@@ -41,6 +51,11 @@ class SmartAss::RGBAColor
     c.unshift(c.pop)
   end
 
+  def abgr_components
+    argb = argb_components
+    [argb[0], argb[1..3].reverse].flatten
+  end
+
   def rgb_components
     c = components
     c.pop

data/lib/smart_ass/version.rb

@@ -1,3 +1,3 @@
 module SmartAss
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/smart_ass/ycbcr_colormatrix.rb

@@ -22,7 +22,7 @@ class SmartAss::YCbCrColorMatrix
 
   # YPbPr -> RGB []
   def to_rgb_matrix_from_ypbpr
-    zeros to_ypbpr_matrix_from_rgb.inverse
+    to_ypbpr_matrix_from_rgb.inverse
   end
 
   # RGB -> YCbCr []
@@ -32,32 +32,32 @@ class SmartAss::YCbCrColorMatrix
 
   # YCbCr -> RGB []
   def to_rgb_matrix_from_ycbcr
-    zeros to_ycbcr_matrix_from_rgb.inverse
+    to_ycbcr_matrix_from_rgb.inverse
   end
 
   # RGB(digital) -> YCbCr []
   def to_ycbcr_matrix_from_rgbd
-    scale_rows to_ycbcr_matrix_from_rgb, *[256.0/255.0]*3
+    scale_rows to_ycbcr_matrix_from_rgb, *[1.0/255.0]*3
   end
 
   # YCbCr -> RGB(digital) []
   def to_rgbd_matrix_from_ycbcr
-    scale_rows zeros(to_ycbcr_matrix_from_rgbd.inverse), *[256.0*256.0]*3
+    to_ycbcr_matrix_from_rgbd.inverse
   end
 
   # RGB(digital) -> YCbCr Equation
   def to_ycbcr_from_rgb(*rgb)
-    apply_equation(*rgb) do |*rgb|
-      offset_vector + (to_ycbcr_matrix_from_rgbd * 1.0 / 256.0) *
-        Matrix.column_vector(rgb)
+    r = apply_equation(*rgb) do |*rgb|
+      offset_vector + (to_ycbcr_matrix_from_rgbd * Matrix.column_vector(rgb))
     end
+
+    clip_ycbcr(r)
   end
 
   # YCbCr -> RGB(digital) Equation
   def to_rgb_from_ycbcr(*ycbcr)
     r = apply_equation(*ycbcr) do |*ycbcr|
-      (to_rgbd_matrix_from_ycbcr * 1.0 / 256.0) *
-        (Matrix.column_vector(ycbcr) - offset_vector)
+      to_rgbd_matrix_from_ycbcr * (Matrix.column_vector(ycbcr) - offset_vector)
     end.map(&:round)
 
     clip_rgb(r)
@@ -65,8 +65,33 @@ class SmartAss::YCbCrColorMatrix
 
   private
   def clip_rgb(input)
-    input.map {|n| n >= 0 ? n : 0}
-         .map {|n| n <= 255 ? n : 255}
+    input.map {|n| clip_component(n, 0, 255)}
+  end
+
+  def clip_ycbcr(input)
+    [
+      clip_component(input[0], *y_minmax),
+      clip_component(input[1], *cbcr_minmax),
+      clip_component(input[2], *cbcr_minmax)
+    ]
+  end
+
+  def clip_component(c, min, max)
+    if c < min
+      min
+    elsif c > max
+      max
+    else
+      c
+    end
+  end
+
+  def y_minmax
+    [16.0, 235.0]
+  end
+
+  def cbcr_minmax
+    [16.0, 240.0]
   end
 
   def offset_vector
@@ -83,14 +108,4 @@ class SmartAss::YCbCrColorMatrix
       matrix.row(index) * factor
     }]
   end
-
-  def zeros(matrix)
-    matrix.map {|n|
-      if n < 1e-5 and n > -1e-5 then
-        0.0
-      else
-        n
-      end
-    }
-  end
 end

data/spec/rgba_color_spec.rb

@@ -27,14 +27,14 @@ describe SmartAss::RGBAColor do
   end
 
   it "can be created from an .ass hex (without alpha)" do
-    c = SmartAss::RGBAColor.from_ass("&HFFFFFF")
-    c.components.should == [255, 255, 255, 0]
+    c = SmartAss::RGBAColor.from_ass("&H1122AAFF")
+    c.components.should == [255, 0xAA, 0x22, 0x11]
   end
 
   describe "#to_ass" do
     it "returns ass repesentation" do
-      c = SmartAss::RGBAColor.from_argb(0x00, 0xff, 0xff, 0xff)
-      c.to_ass.should == "&H00FFFFFF"
+      c = SmartAss::RGBAColor.from_argb(0x00, 0xff, 0x00, 0x00)
+      c.to_ass.should == "&H000000FF"
 
       c = SmartAss::RGBAColor.from_rgba(*[0xff, 0xff, 0xff] + [0x00])
       c.to_ass.should == "&H00FFFFFF"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_ass
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Utility for YCbCr ColorMatrix conversion of ASS Subtitles.
 email:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Utility for YCbCr ColorMatrix conversion of ASS Subtitles.