Changeset 1009

Timestamp:

10/17/07 09:10:58 (15 months ago)

Author:

stephen_booth

Message:

Use FILE* for io

Location:

trunk/Audio/Decoders

Files:

• MPEGDecoder.h (modified) (1 diff)
• MPEGDecoder.m (modified) (23 diffs)

trunk/Audio/Decoders/MPEGDecoder.h

@@ -26 +26 @@
 @interface MPEGDecoder : AudioDecoder
 {
-        int                                     _fd;
+        FILE                            *_file;
         unsigned char           *_inputBuffer;
         

trunk/Audio/Decoders/MPEGDecoder.m

@@ -94 +94 @@
                 NSAssert(NULL != _inputBuffer, @"Unable to allocate memory");
                 
-                _fd = open([[[self URL] path] fileSystemRepresentation], O_RDONLY);
-                if(-1 == _fd) {
+                _file = fopen([[[self URL] path] fileSystemRepresentation], "r");
+                if(NULL == _file) {
                         if(nil != error) {
-                                
+                                NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary];
+                                
+//                              [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedStringFromTable(@"The format of the file \"%@\" was not recognized.", @"Errors", @""), [[NSFileManager defaultManager] displayNameAtPath:path]] forKey:NSLocalizedDescriptionKey];
+//                              [errorDictionary setObject:NSLocalizedStringFromTable(@"File Format Not Recognized", @"Errors", @"") forKey:NSLocalizedFailureReasonErrorKey];
+//                              [errorDictionary setObject:NSLocalizedStringFromTable(@"The file's extension may not match the file's type.", @"Errors", @"") forKey:NSLocalizedRecoverySuggestionErrorKey];
+                                
+                                *error = [NSError errorWithDomain:NSPOSIXErrorDomain 
+                                                                                         code:errno 
+                                                                                 userInfo:errorDictionary];
                         }
                         
@@ -150 +158 @@
         
         free(_inputBuffer), _inputBuffer = NULL;
-        close(_fd), _fd = -1;
+        fclose(_file), _file = NULL;
         
         if(_bufferList) {
@@ -171 +179 @@
 {
         double  fraction        = (double)frame / [self totalFrames];
-        off_t   seekPoint       = 0;
+        long    seekPoint       = 0;
         
         // If a Xing header was found, interpolate in TOC
@@ -188 +196 @@
                         
                         double x = firstOffset + (secondOffset - firstOffset) * (percent - firstIndex);
-                        seekPoint = (off_t)((1.0 / 256.0) * x * _fileBytes); 
+                        seekPoint = (long)((1.0 / 256.0) * x * _fileBytes); 
         }
         else
-                seekPoint = (off_t)_fileBytes * fraction;
-        
-        off_t result = lseek(_fd, seekPoint, SEEK_SET);
-        if(-1 != result) {
+                seekPoint = (long)_fileBytes * fraction;
+        
+        int result = fseek(_file, seekPoint, SEEK_SET);
+        if(0 == result) {
                 mad_stream_buffer(&_mad_stream, NULL, 0);
                 
@@ -270 +278 @@
                 if(NULL == _mad_stream.buffer || MAD_ERROR_BUFLEN == _mad_stream.error) {
                         if(NULL != _mad_stream.next_frame) {
-                                bytesRemaining          = _mad_stream.bufend - _mad_stream.next_frame;
-                                
+                                bytesRemaining = _mad_stream.bufend - _mad_stream.next_frame;
                                 memmove(_inputBuffer, _mad_stream.next_frame, bytesRemaining);
                                 
@@ -284 +291 @@
                         
                         // Read raw bytes from the MP3 file
-                        ssize_t bytesRead = read(_fd, readStartPointer, bytesToRead);
-                        
-                        if(-1 == bytesRead) {
+                        size_t bytesRead = fread(readStartPointer, 1, bytesToRead, _file);
+                        if(ferror(_file)) {
 #if DEBUG
                                 NSLog(@"Read error: %s.", strerror(errno));
@@ -294 +300 @@
                         
                         // MAD_BUFFER_GUARD zeroes are required to decode the last frame of the file
-                        if(0 == bytesRead) {
+                        if(0 == bytesRead && feof(_file)) {
                                 memset(readStartPointer + bytesRead, 0, MAD_BUFFER_GUARD);
                                 bytesRead       += MAD_BUFFER_GUARD;
@@ -307 +313 @@
                 int result = mad_frame_decode(&_mad_frame, &_mad_stream);
                 if(-1 == result) {
-                        
                         if(MAD_RECOVERABLE(_mad_stream.error)) {
-                                
                                 // Prevent ID3 tags from reporting recoverable frame errors
                                 const uint8_t   *buffer                 = _mad_stream.this_frame;
@@ -324 +328 @@
                                         mad_stream_skip(&_mad_stream, id3_length);
                                 }
-                                else {
 #if DEBUG
+                                else
                                         NSLog(@"Recoverable frame level error (%s)", mad_stream_errorstr(&_mad_stream));
 #endif
-                                }
                                 
                                 continue;
@@ -352 +355 @@
                 
                 // Skip any samples that remain from last frame
-                // This can happen if the LAME encoder delay is greater than the number of samples in a frame
-                // This normally won't happen, but is possible for MP3s that have been gaplessly cut
+                // This can happen if the encoder delay is greater than the number of samples in a frame
+                // This normally won't happen, but is possible
                 unsigned startingSample = _samplesToSkipInNextFrame;
                 
@@ -401 +404 @@
         
         _currentFrame += framesRead;
+        
         return framesRead;
 }
@@ -412 +416 @@
         uint32_t                        framesDecoded = 0;
         UInt32                          bytesToRead, bytesRemaining;
-        ssize_t                         bytesRead;
+        size_t                          bytesRead;
         unsigned char           *readStartPointer;
         BOOL                            readEOF;
@@ -429 +433 @@
         readEOF = NO;
         
-        result = fstat(_fd, &stat);
+        result = fstat(fileno(_file), &stat);
         if(-1 == result)
                 return NO;
@@ -437 +441 @@
         for(;;) {
                 if(NULL == stream.buffer || MAD_ERROR_BUFLEN == stream.error) {
-                        
                         if(stream.next_frame) {
-                                bytesRemaining          = stream.bufend - stream.next_frame;
-                                
+                                bytesRemaining = stream.bufend - stream.next_frame;
                                 memmove(_inputBuffer, stream.next_frame, bytesRemaining);
                                 
@@ -453 +455 @@
                         
                         // Read raw bytes from the MP3 file
-                        bytesRead = read(_fd, readStartPointer, bytesToRead);
-                        
-                        if(-1 == bytesRead) {
+                        bytesRead = fread(readStartPointer, 1, bytesToRead, _file);
+                        if(ferror(_file)) {
 #if DEBUG
                                 NSLog(@"Read error: %s.", strerror(errno));
@@ -463 +464 @@
                         
                         // MAD_BUFFER_GUARD zeroes are required to decode the last frame of the file
-                        if(0 == bytesRead) {
+                        if(0 == bytesRead && feof(_file)) {
                                 memset(readStartPointer + bytesRead, 0, MAD_BUFFER_GUARD);
                                 bytesRead       += MAD_BUFFER_GUARD;
@@ -474 +475 @@
                 
                 result = mad_frame_decode(&frame, &stream);
-                
                 if(-1 == result) {
-                        
                         if(MAD_RECOVERABLE(stream.error)) {
-                                
                                 // Prevent ID3 tags from reporting recoverable frame errors
                                 const uint8_t   *buffer                 = stream.this_frame;
@@ -492 +490 @@
                                         mad_stream_skip(&stream, id3_length);
                                 }
-                                else {
 #if DEBUG
+                                else
                                         NSLog(@"Recoverable frame level error (%s)", mad_stream_errorstr(&stream));
 #endif
-                                }
                                 
                                 continue;
@@ -518 +515 @@
                 // Reference http://www.codeproject.com/audio/MPEGAudioInfo.asp
                 if(1 == framesDecoded) {
-                        
                         _format.mSampleRate                     = frame.header.samplerate;
                         _format.mChannelsPerFrame       = MAD_NCHANNELS(&frame.header);
@@ -549 +545 @@
                         
                         if('Xing' == magic || 'Info' == magic) {
-                                //                      if((('X' << 24) | ('i' << 16) | ('n' << 8) | ('g')) == magic) {
-                                
                                 unsigned        i;
                                 uint32_t        flags = 0, frames = 0, bytes = 0, vbrScale = 0;
@@ -670 +664 @@
                                         
                                 }
-                                }
-                        }
+                        }
+                }
                 else {
                         // Just estimate the number of frames based on the file's size
@@ -679 +673 @@
                         break;
                 }               
-                }
+        }
         
         // Clean up
@@ -686 +680 @@
         
         // Rewind to the beginning of file
-        if(-1 == lseek(_fd, 0, SEEK_SET))
+        if(-1 == fseek(_file, 0, SEEK_SET))
                 return NO;
         
         return YES;
-        }
+}
 
 @end