Ticket #9939: 0001-Fix-AIFF-and-SoundFile-BePac-Deluxe-now-runs-if-you-.patch

build/jam/images/definitions/regular

@@ -140 +140 @@
 ] ;
 
 SYSTEM_ADD_ONS_MEDIA_PLUGINS += [ FFilterByBuildFeatures
+    aiff_reader
     ffmpeg@ffmpeg
     raw_decoder
 ] ;

src/add-ons/media/plugins/aiff_reader/Jamfile

@@ -4 +4 @@
 
 UsePrivateHeaders media ;
 
-Addon aiff_reader :
-    aiff_reader.cpp
-    : be libmedia.so $(TARGET_LIBSUPC++) ;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+    on $(architectureObject) {
+        Addon [ MultiArchDefaultGristFiles aiff_reader ] :
+            aiff_reader.cpp
+            : be media $(TARGET_LIBSUPC++)
+            ;
+    }
+}

src/add-ons/media/plugins/aiff_reader/aiff_reader.cpp

@@ -1 +1 @@
 /*
  * Copyright (c) 2003-2004, Marcus Overhagen
+ * Copyright (c) 2014, Puck Meerburg
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,

src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp

@@ -1 +1 @@
 /*
  * Copyright 2009-2010, Stephan Aßmus <superstippi@gmx.de>
+ * Copyright 2014, Puck Meerburg <puck@puckipedia.nl>
  * All rights reserved. Distributed under the terms of the GNU L-GPL license.
  */
 
@@ -1547 +1548 @@
     if (_streamCount != NULL)
         *_streamCount = streamCount;
 
+    if (stream->Context()->audio_codec_id == CODEC_ID_NONE && stream->Context()->video_codec_id == CODEC_ID_NONE)
+        return B_ERROR;
+
     return B_OK;
 }
 

src/kits/media/SoundFile.cpp

@@ -1 +1 @@
 /***********************************************************************
- * AUTHOR: Marcus Overhagen
+ * AUTHOR: Marcus Overhagen, Puck Meerburg (2014)
  *   FILE: SoundFile.cpp
  *  DESCR: 
  ***********************************************************************/
+#include <string.h>
+
 #include <MediaFile.h>
 #include <MediaTrack.h>
 #include <SoundFile.h>
@@ -15 +17 @@
 BSoundFile::BSoundFile()
 {
     _init_raw_stats();
+    PRINT(1, "Inited BSoundFile\n");
 }
 
 
@@ -23 +26 @@
 {
     _init_raw_stats();
     SetTo(ref,open_mode);
+    PRINT(1, "Inited BSoundFile with ref %p and open_mode 0x%x\n", ref, open_mode);
 }
 
 /* virtual */ 
 BSoundFile::~BSoundFile()
 {
+    PRINT(1, "Destructor called\n");
     delete fSoundFile;
     delete fMediaFile;
         // fMediaTrack will be deleted by the BMediaFile destructor
@@ -37 +42 @@
 status_t
 BSoundFile::InitCheck() const
 {
+    PRINT(1, "InitCheck: ");
     if (!fSoundFile) {
+        PRINT(1, "fSoundFile not inited, so B_NO_INIT\n");
         return B_NO_INIT;
     }
-    return fSoundFile->InitCheck();
+    status_t f = fSoundFile->InitCheck();
+    PRINT(1, "fSoundFile inited, so %d\n", f);
+    return f;
 }
 
 
@@ -239 +248 @@
 BSoundFile::ReadFrames(char *buf,
                        size_t count)
 {
-    UNIMPLEMENTED();
-
-    return 0;
+    size_t frameRead = 0;
+    int64 frames = count;
+    while (count > 0) {
+        status_t status = fMediaTrack->ReadFrames(
+            reinterpret_cast<void *>(buf), &frames);
+        PRINT(1, "ReadFrames: status is %d, after reading %Ld frames (%d requested) into %p\n", status, frames, count, buf);
+        count -= frames;
+        frameRead += frames;
+        buf += fSampleSize * fChannelCount * frames;
+        if (status != B_OK)
+            return status;
+    }
+    return frameRead;
 }
 
 
@@ -249 +268 @@
 BSoundFile::WriteFrames(char *buf,
                         size_t count)
 {
-    UNIMPLEMENTED();
-
-    return 0;
+    PRINT(1, "WriteFrames: Writing %d frames from %p\n", count, buf);
+    return fMediaTrack->WriteFrames(
+        reinterpret_cast<void *>(buf), count);
 }
 
 
 /* virtual */ off_t
 BSoundFile::SeekToFrame(off_t n)
 {
-    UNIMPLEMENTED();
+    int64 frames = n;
+    status_t status = fMediaTrack->SeekToFrame(
+        &frames);
 
-    return 0;
+    PRINT(1, "Seeked to frame %d, got %ld (status = %d)\n", n, frames, status);
+
+    if (status != B_OK)
+        return status;
+
+    return frames;
 }
 
 
@@ -306 +332 @@
 }
 
 
+int32
+_ParseMimeType(char *mime_type)
+{
+    if (strcmp(mime_type, "audio/x-aiff") == 0)
+        return B_AIFF_FILE;
+    if (strcmp(mime_type, "audio/x-wav") == 0)
+        return B_WAVE_FILE;
+    return B_UNKNOWN_FILE;
+}
+
+
 status_t
 BSoundFile::_ref_to_file(const entry_ref *ref)
 {
@@ -328 +365 @@
     switch (mfi.family) {
         case B_AIFF_FORMAT_FAMILY: fFileFormat = B_AIFF_FILE; break;
         case B_WAV_FORMAT_FAMILY:  fFileFormat = B_WAVE_FILE; break;
-        default:                fFileFormat = B_UNKNOWN_FILE; break;
+        default:                   fFileFormat = _ParseMimeType(mfi.mime_type); break;
     }
     int trackNum = 0;
     BMediaTrack * track = 0;
     media_format mf;
     while (trackNum < media->CountTracks()) {
         track = media->TrackAt(trackNum);
-        status = track->EncodedFormat(&mf);
+        status = track->DecodedFormat(&mf);
         if (status != B_OK) {
             media->ReleaseTrack(track);
             delete media;
@@ -393 +430 @@
     }
     fMediaFile = media;
     fMediaTrack = track;
+    fSoundFile = file;
     return B_OK;
 }