Changeset 25444

Timestamp:

05/10/08 21:07:01 (5 days ago)

Author:

dlmcpaul

Message:

fix issue 1779 - crash on mov with audio

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/MOVFileReader.h (modified) (1 diff)
• haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp (modified) (7 diffs)

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

@@ -440 +440 @@
-}
-
-, size_t *size
+
-{
-        if (IsAudio(stream_index)) {

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

@@ -114 +114 @@
-        
-        // Return all Audio Meta Data
-, size_t *size = 0
+
-        // Return all Video Meta Data
-        const   VideoMetaData           *VideoFormat(uint32 stream_index);

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

@@ -253 +253 @@
-                        format->u.raw_audio.buffer_size = stream_header->suggested_buffer_size;
-                } else {
+                
-                        description.family = B_QUICKTIME_FORMAT_FAMILY;
-                        description.u.quicktime.codec = audio_format->compression;
@@ -279 +280 @@
-                                        format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels;
-                                        break;
+                                case AUDIO_IMA4:
+                                
-                                default:
-                                        TRACE("OTHER\n");
@@ -288 +291 @@
-                }
-
-/*              if (audio_format->compression == 0x0001) {
-                        // a raw PCM format
-                        description.family = B_BEOS_FORMAT_FAMILY;
-                        description.u.beos.format = B_BEOS_FORMAT_RAW_AUDIO;
-                        if (B_OK != formats.GetFormatFor(description, format)) 
-                                format->type = B_MEDIA_RAW_AUDIO;
-                        format->u.raw_audio.frame_rate = audio_format->SampleRate;
-                        format->u.raw_audio.channel_count = audio_format->NoOfChannels;
-                        if (audio_format->bits_per_sample <= 8)
-                                format->u.raw_audio.format = B_AUDIO_FORMAT_UINT8;
-                        else if (audio_format->bits_per_sample <= 16)
-                                format->u.raw_audio.format = B_AUDIO_FORMAT_INT16;
-                        else if (audio_format->bits_per_sample <= 24)
-                                format->u.raw_audio.format = B_AUDIO_FORMAT_INT24;
-                        else if (audio_format->bits_per_sample <= 32)
-                                format->u.raw_audio.format = B_AUDIO_FORMAT_INT32;
-                        else {
-                                ERROR("movReader::AllocateCookie: unhandled bits per sample %d\n", audio_format->bits_per_sample);
-                                return B_ERROR;
-                        }
-                        format->u.raw_audio.format |= B_AUDIO_FORMAT_CHANNEL_ORDER_WAVE;
-                        format->u.raw_audio.byte_order = B_MEDIA_BIG_ENDIAN;
-                        format->u.raw_audio.buffer_size = stream_header->suggested_buffer_size;
-                } else {
-                        // some encoded format
-                        description.family = B_WAV_FORMAT_FAMILY;
-                        description.u.wav.codec = audio_format->compression;
-                        if (B_OK != formats.GetFormatFor(description, format)) 
-                                format->type = B_MEDIA_ENCODED_AUDIO;
-                        format->u.encoded_audio.bit_rate = 8 * audio_format->PacketSize;
-                        TRACE("bit_rate %.3f\n", format->u.encoded_audio.bit_rate);
-                        format->u.encoded_audio.output.frame_rate = audio_format->SampleRate;
-                        format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels;
-                }
-                */
-                // this doesn't seem to work (it's not even a fourcc)
-                format->user_data_type = B_CODEC_TYPE_INFO;
-                *(uint32 *)format->user_data = audio_format->compression; format->user_data[4] = 0;
-                
-
-
-
-
+
+
+
+
+
+
-
-#ifdef TRACE_MOV_READER
@@ -383 +353 @@
-                format->user_data_type = B_CODEC_TYPE_INFO;
-                *(uint32 *)format->user_data = description.u.quicktime.codec; format->user_data[4] = 0;
+                
-                format->u.encoded_video.max_bit_rate = 8 * theFileReader->MovMainHeader()->max_bytes_per_sec;
-                format->u.encoded_video.avg_bit_rate = format->u.encoded_video.max_bit_rate / 2; // XXX fix this
@@ -392 +363 @@
-                format->u.encoded_video.output.pixel_width_aspect = 1;
-                format->u.encoded_video.output.pixel_height_aspect = 1;
-                // format->u.encoded_video.output.display.format = 0;
-                format->u.encoded_video.output.display.line_width = theFileReader->MovMainHeader()->width;
-                format->u.encoded_video.output.display.line_count = cookie->line_count;
@@ -403 +373 @@
-                TRACE("field_rate   %.3f\n", format->u.encoded_video.output.field_rate);
-
-et the VOL
-if (video_format->VOLSize > 0) {
-       TRACE("VOL SIZE  %ld\n", video_format->VOLSize)
-       size_t size = video_format->VOLSize;
-const void *data = video_format->theVOL
+ome decoders need additional metadata passed via a special Atom
+size_t size = video_format->VOLSize;
+const void *data = video_format->theVOL
+if (size > 0) {
+TRACE("VOL SIZE  %ld\n", size)
-                        format->SetMetaData(data, size);
-                }
@@ -440 +410 @@
-        *duration = cookie->duration;
-        *format = cookie->format;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return B_OK;
-}