librtmp 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.1.4
+======
+* Added check to make sure we only use RTMP_Write() when we are sending FLV data.
+* Updated FFI implementation.
+
 v0.1.3
 ======
 * Added nil check before sending data in Streamer#send.

data/lib/librtmp/ffi/amf.rb

@@ -86,13 +86,13 @@ module Librtmp
     # void AMF_DecodeLongString(const char *data, AVal * str);
     # int AMF_DecodeBoolean(const char *data);
     # double AMF_DecodeNumber(const char *data);
-    attach_function :AMF_DecodeInt16, [:string], :ushort
-    attach_function :AMF_DecodeInt24, [:string], :uint
-    attach_function :AMF_DecodeInt32, [:string], :uint
-    attach_function :AMF_DecodeString, [:string, AVal], :void
-    attach_function :AMF_DecodeLongString, [:string, AVal], :void
-    attach_function :AMF_DecodeBoolean, [:string], :int
-    attach_function :AMF_DecodeNumber, [:string], :double
+    attach_function :AMF_DecodeInt16, [:pointer], :ushort
+    attach_function :AMF_DecodeInt24, [:pointer], :uint
+    attach_function :AMF_DecodeInt32, [:pointer], :uint
+    attach_function :AMF_DecodeString, [:pointer, AVal], :void
+    attach_function :AMF_DecodeLongString, [:pointer, AVal], :void
+    attach_function :AMF_DecodeBoolean, [:pointer], :int
+    attach_function :AMF_DecodeNumber, [:pointer], :double
 
     # char *AMF_Encode(AMFObject * obj, char *pBuffer, char *pBufEnd);
     # int AMF_Decode(AMFObject * obj, const char *pBuffer, int nSize, int bDecodeName);

data/lib/librtmp/ffi/rtmp.rb

@@ -24,7 +24,7 @@ module Librtmp
              :m_packetType,      :uint8,
              :m_hasAbsTimestamp, :uint8,
              :m_nChannel,        :int,
-             :m_nTimestamp,      :uint32,
+             :m_nTimeStamp,      :uint32,
              :m_nInfoField2,     :int32,
              :m_nBodySize,       :uint32,
              :m_nBytesRead,      :uint32,
@@ -169,6 +169,8 @@ module Librtmp
              :Link,               RTMP_LNK
     end
 
+    attach_function :RTMP_GetTime, [], :uint32
+
     attach_function :RTMPPacket_Reset, [RTMPPacket], :void
     attach_function :RTMPPacket_Dump, [RTMPPacket], :void
     attach_function :RTMPPacket_Alloc, [RTMPPacket, :int], :int

data/lib/librtmp/streamer.rb

@@ -35,15 +35,9 @@ module Librtmp
       return if data.nil? || data == ''
 
       if data.is_a?(Hash)
-        packet = build_metadata_packet(data)
-
-        FFI::RTMP_SendPacket(@session_ptr, packet.pointer, 1)
-        #FFI::RTMP_FreePacket(packet.pointer)
-      else
-        data_buffer = ::FFI::MemoryPointer.new(:char, data.size)
-        data_buffer.put_bytes(0, data)
-
-        FFI::RTMP_Write(@session_ptr, data_buffer, data.size)
+        send_metadata_packet(data)
+      elsif is_flv?(data)
+        FFI::RTMP_Write(@session_ptr, data, data.size)
       end
     end
 
@@ -65,7 +59,7 @@ module Librtmp
       @session = FFI::RTMP.new @session_ptr
     end
 
-    def build_metadata_packet(data)
+    def send_metadata_packet(data)
       packet = FFI::RTMPPacket.new
       amf_object = FFI::AMFObject.new
       amf_object_ptr = amf_object.pointer
@@ -99,5 +93,9 @@ module Librtmp
 
       packet
     end
+
+    def is_flv?(data)
+      data[0..2] == 'FLV'
+    end
   end
 end

data/lib/librtmp/version.rb

@@ -1,3 +1,3 @@
 module Librtmp
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librtmp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314008930840 !ruby/object:Gem::Requirement
+  requirement: &70300117544840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314008930840
+  version_requirements: *70300117544840
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70314008930360 !ruby/object:Gem::Requirement
+  requirement: &70300117544380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314008930360
+  version_requirements: *70300117544380
 description: Provides a wrapper for the librtmp library in Ruby to allow use of the
   RTMP streaming protocols
 email:
@@ -67,12 +67,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4153078302273606918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4153078302273606918
 requirements: []
 rubyforge_project: librtmp
 rubygems_version: 1.8.12