From 241510044439d1aeb2011f45a11a6dfe24abd0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 19 Jul 2008 15:40:21 +0000 Subject: [PATCH] * More debug output with regards to the codec id for video streams. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26507 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/plugins/avi_reader/avi_reader.cpp | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/add-ons/media/plugins/avi_reader/avi_reader.cpp b/src/add-ons/media/plugins/avi_reader/avi_reader.cpp index e9c29827d0..c0bdc3fc22 100644 --- a/src/add-ons/media/plugins/avi_reader/avi_reader.cpp +++ b/src/add-ons/media/plugins/avi_reader/avi_reader.cpp @@ -253,13 +253,22 @@ aviReader::AllocateCookie(int32 streamNumber, void **_cookie) cookie->frames_per_sec_scale = fFile->StreamInfo(streamNumber)->frames_per_sec_scale; 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; - 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; - else + } else 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) 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("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; } + TRACE("aviReader::GetStreamInfo: stream is neither video nor audio\n"); + delete cookie; return B_ERROR; }