i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Then the video fourcc is 0 or 'fake', the compression ID is used instead. This fixes problems with a few AVI files.

Browse Source 
Disabled most debugging output.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6618 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2004-02-17 22:37:52 +00:00
parent 7be5d9c6ad
commit 91a3abc0dc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/avi_reader/avi_reader.cpp
+6 -4
View File
@@ -8,8 +8,7 @@
#include "RawFormats.h"
#include "avi_reader.h"
#define TRACE_THIS 1
#if TRACE_THIS
#if 0
#define TRACE printf
#else
#define TRACE(a...)
@@ -267,12 +266,15 @@ aviReader::AllocateCookie(int32 streamNumber, void **_cookie)
TRACE("duration %.6f (%Ld)\n", cookie->duration / 1E6, cookie->duration);
description.family = B_AVI_FORMAT_FAMILY;
description.u.avi.codec = stream_header->fourcc_handler;
if (stream_header->fourcc_handler == 'ekaf' || stream_header->fourcc_handler == 0) // 'fake' or 0 fourcc => used compression id
description.u.avi.codec = video_format->compression;
else
description.u.avi.codec = stream_header->fourcc_handler;
if (B_OK != formats.GetFormatFor(description, format))
format->type = B_MEDIA_ENCODED_VIDEO;
format->user_data_type = B_CODEC_TYPE_INFO;
*(uint32 *)format->user_data = stream_header->fourcc_handler; format->user_data[4] = 0;
*(uint32 *)format->user_data = description.u.avi.codec; format->user_data[4] = 0;
format->u.encoded_video.max_bit_rate = 8 * fFile->AviMainHeader()->max_bytes_per_sec;
format->u.encoded_video.avg_bit_rate = format->u.encoded_video.max_bit_rate / 2; // XXX fix this
format->u.encoded_video.output.field_rate = cookie->frames_per_sec_rate / (float)cookie->frames_per_sec_scale;