avifil32: Use chunksize specified by the chunk itself, avoids a noticable…

avifil32: Use chunksize specified by the chunk itself, avoids a noticable ticking sound heard when reading past the chunk boundary.

avifil32: Use chunksize specified by the chunk itself, avoids a noticable…
7401af64 · Julius Schwartzenberg · Alexandre Julliard · b0ad0b9c · 7401af64
Commit 7401af64 authored Jan 20, 2010 by Julius Schwartzenberg Committed by Alexandre Julliard Jan 21, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

avifile.c dlls/avifil32/avifile.c +4 -1

No files found.
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -1103,6 +1103,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start,
    samples *= This->sInfo.dwSampleSize;

    while (samples > 0 && buffersize > 0) {
+      LONG blocksize;
      if (block != This->dwCurrentFrame) {
 	hr = AVIFILE_ReadBlock(This, block, NULL, 0);
 	if (FAILED(hr))
@@ -1110,7 +1111,9 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start,
      }

      size = min((DWORD)samples, (DWORD)buffersize);
-      size = min(size, This->cbBuffer - offset);
+      blocksize = This->lpBuffer[1];
+      TRACE("blocksize = %u\n",blocksize);
+      size = min(size, blocksize - offset);
      memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size);

      block++;