Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* More debug output with regards to the codec id for video streams.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26507 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2008-07-19 15:40:21 +00:00
parent bfc786ca45
commit 2415100444
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/add-ons/media/plugins/avi_reader/avi_reader.cpp
View File

@ -253,13 +253,22 @@ aviReader::AllocateCookie(int32 streamNumber, void **_cookie)
cookie->frames_per_sec_scale = fFile->StreamInfo(streamNumber)->frames_per_sec_scale; cookie->frames_per_sec_scale = fFile->StreamInfo(streamNumber)->frames_per_sec_scale;
cookie->line_count = fFile->AviMainHeader()->height; cookie->line_count = fFile->AviMainHeader()->height;
TRACE("video frame_count %Ld, duration %.6f\n", cookie->frame_count, cookie->duration / 1E6); TRACE("video frame_count %Ld, duration %.6f\n", cookie->frame_count,
cookie->duration / 1E6);
description.family = B_AVI_FORMAT_FAMILY; description.family = B_AVI_FORMAT_FAMILY;
if (stream_header->fourcc_handler == 'ekaf' || stream_header->fourcc_handler == 0) // 'fake' or 0 fourcc => used compression id 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; description.u.avi.codec = video_format->compression;
else } else
description.u.avi.codec = stream_header->fourcc_handler; description.u.avi.codec = stream_header->fourcc_handler;
TRACE("codec '%.4s' (fourcc: '%.4s', compression: '%.4s')\n",
(char*)&description.u.avi.codec,
(char*)&stream_header->fourcc_handler,
(char*)&video_format->compression);
if (formats.GetFormatFor(description, format) < B_OK) if (formats.GetFormatFor(description, format) < B_OK)
format->type = B_MEDIA_ENCODED_VIDEO; format->type = B_MEDIA_ENCODED_VIDEO;
@ -284,10 +293,16 @@ aviReader::AllocateCookie(int32 streamNumber, void **_cookie)
TRACE("max_bit_rate %.3f\n", format->u.encoded_video.max_bit_rate); TRACE("max_bit_rate %.3f\n", format->u.encoded_video.max_bit_rate);
TRACE("field_rate %.3f\n", format->u.encoded_video.output.field_rate); TRACE("field_rate %.3f\n", format->u.encoded_video.output.field_rate);
#ifdef TRACE_AVI_READER
uint32 encoding = format->Encoding();
TRACE("encoding '%.4s'\n", (char*)&encoding);
#endif
return B_OK; return B_OK;
} }
TRACE("aviReader::GetStreamInfo: stream is neither video nor audio\n");
delete cookie; delete cookie;
return B_ERROR; return B_ERROR;
} }