Changeset 25448

Timestamp:

05/11/08 08:09:54 (5 days ago)

Author:

dlmcpaul

Message:

Hardcode IMA4 sound description

Files:

• haiku/trunk/src/add-ons/media/plugins/mov_reader/libMOV/MOVFileReader.cpp (modified) (1 diff)
• haiku/trunk/src/add-ons/media/plugins/mov_reader/libMOV/MOVParser.cpp (modified) (2 diffs)
• haiku/trunk/src/add-ons/media/plugins/mov_reader/libMOV/QTStructs.h (modified) (1 diff)
• haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp (modified) (10 diffs)

haiku/trunk/src/add-ons/media/plugins/mov_reader/libMOV/MOVFileReader.cpp

@@ -458 +458 @@
-                                // Hmm 16bit format 32 bit FourCC.
-                                theAudio.compression = aSoundDescription.basefields.DataFormat;
-//                              theAudio.compression = aSoundDescription.desc.CompressionID;
-
-                                theAudio.NoOfChannels = aSoundDescription.desc.NoOfChannels;
-                                theAudio.SampleSize = aSoundDescription.desc.SampleSize;
-                                theAudio.SampleRate = aSoundDescription.desc.SampleRate / 65536;        // Convert from fixed point decimal to float
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                theAudio.theVOL = aSoundDescription.theVOL;

haiku/trunk/src/add-ons/media/plugins/mov_reader/libMOV/MOVParser.cpp

@@ -817 +817 @@
-        Read(&aSoundDescriptionV1->desc.SampleRate);
-
-
+
+
-                Read(&(aSoundDescriptionV1->samplesPerPacket));
-                Read(&(aSoundDescriptionV1->bytesPerPacket));
@@ -825 +826 @@
-        } else {
-                // Calculate?
-
-
-
+
+
+
+
+
+
+
-                } else {
+                        printf("Calculating Sound Description\n");
+                        aSoundDescriptionV1->bytesPerSample = aSoundDescriptionV1->desc.SampleSize / 8;
-                        aSoundDescriptionV1->bytesPerFrame = aSoundDescriptionV1->desc.NoOfChannels * aSoundDescriptionV1->bytesPerSample;
-}
-aSoundDescriptionV1->bytesPerPacket = aSoundDescriptionV1->desc.PacketSiz
-aSoundDescriptionV1->samplesPerPacket = aSoundDescriptionV1->desc.PacketSize / aSoundDescriptionV1->bytesPerFrame;
+       aSoundDescriptionV1->bytesPerPacket = aSoundDescriptionV1->desc.PacketSize;
+       aSoundDescriptionV1->samplesPerPacket = aSoundDescriptionV1->desc.PacketSize / aSoundDescriptionV1->bytesPerFram
+}
-        }
-

haiku/trunk/src/add-ons/media/plugins/mov_reader/libMOV/QTStructs.h

@@ -106 +106 @@
-struct AudioMetaData
-{
-
+type 
-        uint16 NoOfChannels;    // 1 = mono, 2 = stereo
-        uint16 SampleSize;              // bits per sample
-
-
+
+
+
+
-        uint8 *theVOL;
-        size_t VOLSize;

haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp

@@ -35 +35 @@
-#include "mov_reader.h"
-
-//
+
-#ifdef TRACE_MOV_READER
-  #define TRACE printf
@@ -137 +137 @@
-movReader::AllocateCookie(int32 streamNumber, void **_cookie)
-{
+        uint32 codecID;
+
-        mov_cookie *cookie = new mov_cookie;
-        *_cookie = cookie;
@@ -172 +174 @@
-                        return B_ERROR;
-                }
+
+                codecID = B_BENDIAN_TO_HOST_INT32(audio_format->compression);
-
-                cookie->frame_count = theFileReader->getAudioFrameCount(cookie->stream);
@@ -192 +196 @@
-                        cookie->frames_per_sec_scale = 1;
-                        TRACE("bytes_per_sec_rate %ld, bytes_per_sec_scale %ld (using rate)\n", cookie->bytes_per_sec_rate, cookie->bytes_per_sec_scale);
-Packet
-Packet
+Buffer
+Buffer
-                        cookie->bytes_per_sec_scale = 1;
-Packet
+Buffer
-                        cookie->frames_per_sec_scale = 1;
-                        TRACE("bytes_per_sec_rate %ld, bytes_per_sec_scale %ld (using PacketSize)\n", cookie->bytes_per_sec_rate, cookie->bytes_per_sec_scale);
@@ -260 +264 @@
-                        }
-                        
+                        format->u.raw_audio.byte_order = B_MEDIA_BIG_ENDIAN;
+
+                        if (audio_format->SampleSize <= 8)
+                                format->u.raw_audio.format = B_AUDIO_FORMAT_UINT8;
+                        else if (audio_format->SampleSize <= 16)
+                                format->u.raw_audio.format = B_AUDIO_FORMAT_INT16;
+                        else if (audio_format->SampleSize <= 24)
+                                format->u.raw_audio.format = B_AUDIO_FORMAT_INT24;
+                        else if (audio_format->SampleSize <= 32)
+                                format->u.raw_audio.format = B_AUDIO_FORMAT_INT32;
+                        else {
+                                ERROR("movReader::AllocateCookie: unhandled bits per sample %d\n", audio_format->SampleSize);
+                                return B_ERROR;
+                        }
+
+                        format->u.encoded_audio.frame_size = audio_format->FrameSize;
+                        format->u.encoded_audio.output.buffer_size = audio_format->BufferSize;
+
+                        TRACE("compression ");
+
-                        switch (audio_format->compression) {
-                                case AUDIO_MS_PCM02:
@@ -281 +305 @@
-                                        break;
-                                case AUDIO_IMA4:
-
+
+
+
+
+
-                                default:
-\n"
+ %s\n",(char *)(&codecID)
-                                        format->u.encoded_audio.bit_rate = 8 * cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
-                                        format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
@@ -291 +319 @@
-                }
-
-
-
-
+
+
+
+
-                
-                // Some codecs have additional setup data that they need, put it in metadata
@@ -299 +328 @@
-                const void *data = audio_format->theVOL;
-                if (size > 0) {
+                        TRACE("VOL SIZE %ld\n", size);
-                        format->SetMetaData(data, size);
-                }
-
-#ifdef TRACE_MOV_READER
-                uint8 *p = 18 + (uint8 *)data;
-                TRACE("extra_data: %ld: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                        size - 18, p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9]);
-#endif
-        
-                return B_OK;
@@ -318 +342 @@
-                        return B_ERROR;
-                }
+                
+                codecID = B_BENDIAN_TO_HOST_INT32(video_format->compression);
-                
-                cookie->audio = false;
@@ -341 +367 @@
-                TRACE("frame_count %Ld\n", cookie->frame_count);
-                TRACE("duration %.6f (%Ld)\n", cookie->duration / 1E6, cookie->duration);
-video_format->compression
+codecID
-
-                description.family = B_QUICKTIME_FORMAT_FAMILY;