librtmp 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+v0.1.2
+======
+* Fixed issue with Streamer#send not handling null bytes well for binary data;
+  required adjusting Librtmp::FFI#RTMP_Write() implementation to expect a
+  pointer instead of a string.
+* Stubbed out implementation for converting a Hash sent to Streamer#send into
+  an AMF Object to send over the stream.
+
 v0.1.1
 ======
 

data/lib/librtmp/ffi/rtmp.rb

@@ -233,7 +233,7 @@ module Librtmp
     attach_function :RTMP_SendClientBW, [RTMP], :int
     attach_function :RTMP_DropRequest, [RTMP, :int, :int], :void
     attach_function :RTMP_Read, [RTMP, :pointer, :int], :int
-    attach_function :RTMP_Write, [RTMP, :string, :int], :int
+    attach_function :RTMP_Write, [RTMP, :pointer, :int], :int
     
     attach_function :RTMP_HashSWF, [:string, :pointer, :pointer, :int], :int
   end

data/lib/librtmp/streamer.rb

@@ -33,12 +33,14 @@ module Librtmp
 
     def send(data)
       if data.is_a?(Hash)
-        # TODO Handle conversion of Hash to AMF Object
+        packet = build_metadata_packet(data)
+
+        FFI::RTMP_SendPacket(@session_ptr, packet.pointer, 1)
       else
-        chunk = data.to_s
-        chunk_size = chunk.bytes.to_a.size
+        data_buffer = ::FFI::MemoryPointer.new(:char, data.size)
+        data_buffer.put_bytes(0, data)
 
-        FFI::RTMP_Write(@session_ptr, chunk, chunk_size)
+        FFI::RTMP_Write(@session_ptr, data_buffer, data.size)
       end
     end
 
@@ -59,5 +61,40 @@ module Librtmp
 
       @session = FFI::RTMP.new @session_ptr
     end
+
+    def build_metadata_packet(data)
+      packet = FFI::RTMPPacket.new
+      amf_object = FFI::AMFObject.new
+      amf_object_ptr = amf_object.pointer
+
+      data.each do |key, value|
+        amf_prop = FFI::AMFObjectProperty.new
+        amf_prop_ptr = amf_prop.pointer
+
+        prop_name = key.to_s
+        aval = FFI::AVal.new
+        aval.av_len = prop_name.bytes.to_a.size
+        aval.av_val = ::FFI::MemoryPointer.from_string(prop_name)
+
+        amf_prop.p_name = name_aval
+
+        case value
+          when is_a?(String)
+            amf_prop.p_type = :amf_string
+
+            aval = FFI::AVal.new
+            aval.av_len = value.bytes.to_a.size
+            aval.av_val = ::FFI::MemoryPointer.from_string(value)
+
+            amf_prop.p_vu.p_aval = aval
+          else
+            #???
+        end
+
+        FFI::AMF_AddProp(amf_object_ptr, amf_prop_ptr)
+      end
+
+      packet
+    end
   end
 end

data/lib/librtmp/version.rb

@@ -1,3 +1,3 @@
 module Librtmp
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librtmp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213899045000 !ruby/object:Gem::Requirement
+  requirement: &70224132986380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213899045000
+  version_requirements: *70224132986380
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70213899044520 !ruby/object:Gem::Requirement
+  requirement: &70224132985900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213899044520
+  version_requirements: *70224132985900
 description: Provides a wrapper for the librtmp library in Ruby to allow use of the
   RTMP streaming protocols
 email: