Vorbis fixes

lime/_backend/native/NativeCFFI.hx

@@ -551,7 +551,7 @@ class NativeCFFI {
 	@:cffi private static function lime_vorbis_file_pcm_total (vorbisFile:Dynamic, bitstream:Int):Dynamic;
 	@:cffi private static function lime_vorbis_file_raw_tell (vorbisFile:Dynamic):Dynamic;
 	@:cffi private static function lime_vorbis_file_raw_total (vorbisFile:Dynamic, bitstream:Int):Dynamic;
-	@:cffi private static function lime_vorbis_file_read (vorbisFile:Dynamic, buffer:Dynamic, length:Int, bigendianp:Bool, word:Int, signed:Bool):Dynamic;
+	@:cffi private static function lime_vorbis_file_read (vorbisFile:Dynamic, buffer:Dynamic, position:Int, length:Int, bigendianp:Bool, word:Int, signed:Bool):Dynamic;
 	@:cffi private static function lime_vorbis_file_read_float (vorbisFile:Dynamic, pcmChannels:Dynamic, samples:Int):Dynamic;
 	@:cffi private static function lime_vorbis_file_seekable (vorbisFile:Dynamic):Bool;
 	@:cffi private static function lime_vorbis_file_serial_number (vorbisFile:Dynamic, bitstream:Int):Int;

lime/media/codecs/vorbis/VorbisFile.hx

@@ -190,11 +190,17 @@ class VorbisFile {
 	public function pcmTell ():Int64 {
 		
 		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_pcm_tell (handle);
+		var data = NativeCFFI.lime_vorbis_file_pcm_tell (handle);
-		#else
+		
-		return 0;
+		if (data != null) {
+			
+			return Int64.make (data.high, data.low);
+			
+		}
 		#end
 		
+		return Int64.ofInt (0);
+		
 	}
 	
 	
@@ -202,11 +208,17 @@ class VorbisFile {
 	public function pcmTotal (bitstream:Int = -1):Int64 {
 		
 		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_pcm_total (handle, bitstream);
+		var data = NativeCFFI.lime_vorbis_file_pcm_total (handle, bitstream);
-		#else
+		
-		return 0;
+		if (data != null) {
+			
+			return Int64.make (data.high, data.low);
+			
+		}
 		#end
 		
+		return Int64.ofInt (0);
+		
 	}
 	
 	
@@ -234,30 +246,43 @@ class VorbisFile {
 	
 	public function rawTell ():Int64 {
 		
+		
 		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_raw_tell (handle);
+		var data = NativeCFFI.lime_vorbis_file_raw_tell (handle);
-		#else
+		
-		return 0;
+		if (data != null) {
+			
+			return Int64.make (data.high, data.low);
+			
+		}
 		#end
 		
+		return Int64.ofInt (0);
+		
 	}
 	
 	
 	public function rawTotal (bitstream:Int = -1):Int64 {
 		
 		#if (lime_cffi && lime_vorbis && !macro)
-		return NativeCFFI.lime_vorbis_file_raw_total (handle, bitstream);
+		var data = NativeCFFI.lime_vorbis_file_raw_total (handle, bitstream);
-		#else
+		
-		return 0;
+		if (data != null) {
+			
+			return Int64.make (data.high, data.low);
+			
+		}
 		#end
 		
+		return Int64.ofInt (0);
+		
 	}
 	
 	
-	public function read (buffer:Bytes, length:Int = 4096, bigEndianPacking:Bool = false, wordSize:Int = 2, signed:Bool = true):Int {
+	public function read (buffer:Bytes, position:Int, length:Int = 4096, bigEndianPacking:Bool = false, wordSize:Int = 2, signed:Bool = true):Int {
 		
 		#if (lime_cffi && lime_vorbis && !macro)
-		var data = NativeCFFI.lime_vorbis_file_read (handle, buffer, length, bigEndianPacking, wordSize, signed);
+		var data = NativeCFFI.lime_vorbis_file_read (handle, buffer, position, length, bigEndianPacking, wordSize, signed);
 		bitstream = data.bitstream;
 		return data.returnValue;
 		#else

project/src/media/codecs/vorbis/VorbisBindings.cpp

@@ -7,31 +7,54 @@
 namespace lime {
 	
 	
+	static int id_bitrateUpper;
+	static int id_bitrateNominal;
+	static int id_bitrateLower;
 	static int id_bitstream;
+	static int id_channels;
 	static int id_high;
 	static int id_low;
+	static int id_rate;
 	static int id_returnValue;
+	static int id_version;
+	static value infoValue;
 	static value int64Value;
 	static value readValue;
 	static bool init = false;
 	
 	
+	inline void _initializeVorbis () {
+		
+		if (!init) {
+			
+			id_bitrateUpper = val_id ("bitrateUpper");
+			id_bitrateNominal = val_id ("bitrateNominal");
+			id_bitrateLower = val_id ("bitrateLower");
+			id_bitstream = val_id ("bitstream");
+			id_channels = val_id ("channels");
+			id_high = val_id ("high");
+			id_low = val_id ("low");
+			id_rate = val_id ("rate");
+			id_returnValue = val_id ("returnValue");
+			id_version = val_id ("version");
+			
+			infoValue = alloc_empty_object ();
+			int64Value = alloc_empty_object ();
+			readValue = alloc_empty_object ();
+			
+			init = true;
+			
+		}
+		
+	}
+	
+	
 	value allocInt64 (ogg_int64_t val) {
 		
 		ogg_int32_t low = val;
 		ogg_int32_t high = (val >> 32);
 		
-		if (!init) {
+		_initializeVorbis ();
-			
-			id_bitstream = val_id ("bitstream");
-			id_high = val_id ("high");
-			id_low = val_id ("low");
-			id_returnValue = val_id ("returnValue");
-			int64Value = alloc_empty_object ();
-			readValue = alloc_empty_object ();
-			init = true;
-			
-		}
 		
 		alloc_field (int64Value, id_low, alloc_int (low));
 		alloc_field (int64Value, id_high, alloc_int (high));
@@ -69,8 +92,13 @@ namespace lime {
 	
 	void lime_vorbis_file_clear (value vorbisFile) {
 		
-		OggVorbis_File* file = (OggVorbis_File*)(uintptr_t)val_data (vorbisFile);
+		if (!val_is_null (vorbisFile)) {
-		ov_clear (file);
+			
+			OggVorbis_File* file = (OggVorbis_File*)(uintptr_t)val_data (vorbisFile);
+			val_gc (vorbisFile, 0);
+			ov_clear (file);
+			
+		}
 		
 	}
 	
@@ -93,6 +121,24 @@ namespace lime {
 	
 	value lime_vorbis_file_info (value vorbisFile, int bitstream) {
 		
+		OggVorbis_File* file = (OggVorbis_File*)(uintptr_t)val_data (vorbisFile);
+		vorbis_info *info = ov_info (file, bitstream);
+		
+		if (info) {
+			
+			_initializeVorbis ();
+			
+			alloc_field (infoValue, id_version, alloc_int (info->version));
+			alloc_field (infoValue, id_channels, alloc_int (info->channels));
+			alloc_field (infoValue, id_rate, alloc_int (info->rate));
+			alloc_field (infoValue, id_bitrateUpper, alloc_int (info->bitrate_upper));
+			alloc_field (infoValue, id_bitrateNominal, alloc_int (info->bitrate_nominal));
+			alloc_field (infoValue, id_bitrateLower, alloc_int (info->bitrate_lower));
+			
+			return infoValue;
+			
+		}
+		
 		return alloc_null ();
 		
 	}
@@ -217,7 +263,13 @@ namespace lime {
 	}
 	
 	
-	value lime_vorbis_file_read (value vorbisFile, value buffer, int length, bool bigendianp, int word, bool sgned) {
+	value lime_vorbis_file_read (value vorbisFile, value buffer, int position, int length, bool bigendianp, int word, bool sgned) {
+		
+		if (val_is_null (buffer)) {
+			
+			return alloc_null ();
+			
+		}
 		
 		Bytes bytes;
 		bytes.Set (buffer);
@@ -225,7 +277,9 @@ namespace lime {
 		int bitstream;
 		
 		OggVorbis_File* file = (OggVorbis_File*)(uintptr_t)val_data (vorbisFile);
-		long result = ov_read (file, (char*)bytes.Data (), length, bigendianp, word, sgned, &bitstream);
+		long result = ov_read (file, (char*)bytes.Data () + position, length, bigendianp, word, sgned, &bitstream);
+		
+		_initializeVorbis ();
 		
 		alloc_field (readValue, id_bitstream, alloc_int (bitstream));
 		alloc_field (readValue, id_returnValue, alloc_int (result));
@@ -345,7 +399,7 @@ namespace lime {
 	DEFINE_PRIME3 (lime_vorbis_file_raw_seek_lap);
 	DEFINE_PRIME1 (lime_vorbis_file_raw_tell);
 	DEFINE_PRIME2 (lime_vorbis_file_raw_total);
-	DEFINE_PRIME6 (lime_vorbis_file_read);
+	DEFINE_PRIME7 (lime_vorbis_file_read);
 	DEFINE_PRIME3 (lime_vorbis_file_read_float);
 	DEFINE_PRIME1 (lime_vorbis_file_seekable);
 	DEFINE_PRIME2 (lime_vorbis_file_serial_number);

project/src/media/containers/OGG.cpp

@@ -62,7 +62,12 @@ namespace lime {
 		while (bytes > 0) {
 			
 			bytes = ov_read (oggFile, (char *)audioBuffer->data->Data () + totalBytes, BUFFER_SIZE, BUFFER_READ_TYPE, 2, 1, &bitStream);
-			totalBytes += bytes;
+			
+			if (bytes > 0) {
+				
+				totalBytes += bytes;
+				
+			}
 			
 		}
 		

project/src/utils/Bytes.cpp

@@ -11,7 +11,7 @@ namespace lime {
 	static bool useBuffer = false;
 	
 	
-	inline void initialize () {
+	inline void _initializeBytes () {
 		
 		if (!init) {
 			
@@ -35,7 +35,7 @@ namespace lime {
 	
 	Bytes::Bytes () {
 		
-		initialize ();
+		_initializeBytes ();
 		
 		_data = 0;
 		_length = 0;
@@ -46,7 +46,7 @@ namespace lime {
 	
 	Bytes::Bytes (int size) {
 		
-		initialize ();
+		_initializeBytes ();
 		
 		_data = 0;
 		_length = 0;
@@ -59,7 +59,7 @@ namespace lime {
 	
 	Bytes::Bytes (value bytes) {
 		
-		initialize ();
+		_initializeBytes ();
 		
 		_data = 0;
 		_length = 0;
@@ -72,7 +72,7 @@ namespace lime {
 	
 	Bytes::Bytes (const char* path) {
 		
-		initialize ();
+		_initializeBytes ();
 		
 		_data = 0;
 		_length = 0;
@@ -85,7 +85,7 @@ namespace lime {
 	
 	Bytes::Bytes (const QuickVec<unsigned char> data) {
 		
-		initialize ();
+		_initializeBytes ();
 		
 		_data = 0;
 		_length = 0;
@@ -218,7 +218,7 @@ namespace lime {
 		} else {
 			
 			_value = bytes;
-			_length = val_int (val_field (bytes, id_length));
+			_length = val_int (val_field (bytes, val_id ("length")));
 			
 			if (_length > 0) {