From 02d71913c4ca3728cae1860cca759ea2e5a70aea Mon Sep 17 00:00:00 2001 From: beveloper Date: Sat, 7 Feb 2004 12:00:30 +0000 Subject: [PATCH] fixed duration calculation git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6517 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/avi_reader/avi_reader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 6694d0221f..a0e938100f 100644 --- a/src/add-ons/media/plugins/avi_reader/avi_reader.cpp +++ b/src/add-ons/media/plugins/avi_reader/avi_reader.cpp @@ -21,9 +21,9 @@ struct avi_cookie { - int stream; + unsigned stream; char * buffer; - int buffer_size; + unsigned buffer_size; int64 frame_count; bigtime_t duration; @@ -258,7 +258,7 @@ aviReader::AllocateCookie(int32 streamNumber, void **_cookie) } cookie->frame_count = stream_header->length; - cookie->duration = ((int64)cookie->frame_count * (int64)cookie->frames_per_sec_rate * 1000000LL) / cookie->frames_per_sec_scale; + cookie->duration = (cookie->frame_count * (int64)cookie->frames_per_sec_scale * 1000000LL) / cookie->frames_per_sec_rate; TRACE("frame_count %Ld\n", cookie->frame_count); TRACE("duration %.6f (%Ld)\n", cookie->duration / 1E6, cookie->duration); @@ -372,7 +372,7 @@ aviReader::GetNextChunk(void *_cookie, *chunkBuffer = cookie->buffer; *chunkSize = size; - return size == fFile->Source()->ReadAt(start, cookie->buffer, size) ? B_OK : B_LAST_BUFFER_ERROR; + return (int)size == fFile->Source()->ReadAt(start, cookie->buffer, size) ? B_OK : B_LAST_BUFFER_ERROR; }