Merge pull request #14 from arigit/master

Add support for audio files of more than 2GB (find_frames function); fixes #13

Author: ralph-irving

Scan.xs

@@ -56,7 +56,7 @@ typedef struct {
   char*	type;
   int (*get_tags)(PerlIO *infile, char *file, HV *info, HV *tags);
   int (*get_fileinfo)(PerlIO *infile, char *file, HV *tags);
-  int (*find_frame)(PerlIO *infile, char *file, int offset);
+  off_t (*find_frame)(PerlIO *infile, char *file, int offset);
   int (*find_frame_return_info)(PerlIO *infile, char *file, int offset, HV *info);
 } taghandler;
 
@@ -268,7 +268,7 @@ CODE:
 OUTPUT:
   RETVAL
 
-int
+IV
 _find_frame( char *dummy, char *suffix, PerlIO *infile, SV *path, int offset )
 CODE:
 {

include/asf.h

@@ -218,5 +218,5 @@ void _parse_content_encryption(asfinfo *asf);
 void _parse_extended_content_encryption(asfinfo *asf);
 void _parse_script_command(asfinfo *asf);
 SV *_parse_picture(asfinfo *asf, uint32_t picture_offset);
-int asf_find_frame(PerlIO *infile, char *file, int offset);
+off_t asf_find_frame(PerlIO *infile, char *file, int offset);
 int _timestamp(asfinfo *asf, int offset, int *duration);

include/mp3.h

@@ -225,7 +225,7 @@ static int sample_rate_tbl[ ] = {
 
 int get_mp3tags(PerlIO *infile, char *file, HV *info, HV *tags);
 int get_mp3fileinfo(PerlIO *infile, char *file, HV *info);
-int mp3_find_frame(PerlIO *infile, char *file, int offset);
+off_t mp3_find_frame(PerlIO *infile, char *file, int offset);
 
 mp3info * _mp3_parse(PerlIO *infile, char *file, HV *info);
 int _decode_mp3_frame(unsigned char *bptr, struct mp3frame *frame);

include/mp4.h

@@ -123,7 +123,7 @@ typedef struct mp4info {
 } mp4info;
 
 static int get_mp4tags(PerlIO *infile, char *file, HV *info, HV *tags);
-int mp4_find_frame(PerlIO *infile, char *file, int offset);
+off_t mp4_find_frame(PerlIO *infile, char *file, int offset);
 int mp4_find_frame_return_info(PerlIO *infile, char *file, int offset, HV *info);
 
 mp4info * _mp4_parse(PerlIO *infile, char *file, HV *info, HV *tags, uint8_t seeking);

include/ogf.h

@@ -16,7 +16,7 @@
 
 int get_ogf_metadata(PerlIO *infile, char *file, HV *info, HV *tags);
 int ogf_find_frame_return_info(PerlIO *infile, char *file, int offset, HV *info);
-int ogf_find_frame(PerlIO *infile, char *file, int offset);
+off_t ogf_find_frame(PerlIO *infile, char *file, int offset);
 
 static int _ogf_parse(PerlIO *infile, char *file, HV *info, HV *tags, uint8_t seeking);
-static int _ogf_find_frame(PerlIO *infile, char *file, int offset, HV *info, HV *tags);
+static off_t _ogf_find_frame(PerlIO *infile, char *file, int offset, HV *info, HV *tags);

include/ogg.h

@@ -20,6 +20,6 @@
 
 int get_ogg_metadata(PerlIO *infile, char *file, HV *info, HV *tags);
 int _ogg_parse(PerlIO *infile, char *file, HV *info, HV *tags, uint8_t seeking);
-static int ogg_find_frame(PerlIO *infile, char *file, int offset);
+static off_t ogg_find_frame(PerlIO *infile, char *file, int offset);
 void _parse_vorbis_comments(PerlIO *infile, Buffer *vorbis_buf, HV *tags, int has_framing);
 int _ogg_binary_search_sample(PerlIO *infile, char *file, HV *info, uint64_t target_sample);

include/opus.h

@@ -18,6 +18,6 @@
 
 int get_opus_metadata(PerlIO *infile, char *file, HV *info, HV *tags);
 int _opus_parse(PerlIO *infile, char *file, HV *info, HV *tags, uint8_t seeking);
-static int opus_find_frame(PerlIO *infile, char *file, int offset);
+static off_t opus_find_frame(PerlIO *infile, char *file, int offset);
 void _parse_vorbis_comments(PerlIO *infile, Buffer *vorbis_buf, HV *tags, int has_framing);
 int _opus_binary_search_sample(PerlIO *infile, char *file, HV *info, uint64_t target_sample);

src/asf.c

@@ -1495,7 +1495,7 @@ _parse_picture(asfinfo *asf, uint32_t picture_offset)
 
 // offset is in ms
 // Based on some code from Rockbox
-int
+off_t
 asf_find_frame(PerlIO *infile, char *file, int time_offset)
 {
   int frame_offset = -1;

src/flac.c

@@ -270,7 +270,7 @@ _flac_parse(PerlIO *infile, char *file, HV *info, HV *tags, uint8_t seeking)
 
 // offset is in ms, does sample-accurate seeking, using seektable if available
 // based on libFLAC seek_to_absolute_sample_
-static int
+static off_t
 flac_find_frame(PerlIO *infile, char *file, int offset)
 {
   off_t frame_offset = -1;

src/mp3.c

@@ -903,7 +903,7 @@ _mp3_parse(PerlIO *infile, char *file, HV *info)
   return mp3;
 }
 
-int
+off_t
 mp3_find_frame(PerlIO *infile, char *file, int offset)
 {
   Buffer mp3_buf;