ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qcap: Get rid of V4l_GetFrame(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-04-10 22:32:01 -05:00 committed by Alexandre Julliard
parent bc42cc4279
commit e32dead363
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/qcap/v4l.c
View File

@ -361,27 +361,13 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input)
} }
} }
static void V4l_GetFrame(Capture *device, unsigned char **buffer)
{
while (video_read(device->fd, device->image_data, device->image_size) == -1)
{
if (errno != EAGAIN)
{
ERR("Failed to read frame: %s\n", strerror(errno));
break;
}
}
TRACE("Successfully read a frame.\n");
*buffer = device->image_data;
}
static DWORD WINAPI ReadThread(LPVOID lParam) static DWORD WINAPI ReadThread(LPVOID lParam)
{ {
Capture * capBox = lParam; Capture * capBox = lParam;
HRESULT hr; HRESULT hr;
IMediaSample *pSample = NULL; IMediaSample *pSample = NULL;
ULONG framecount = 0; ULONG framecount = 0;
unsigned char *pTarget, *pInput, *pOutput; unsigned char *pTarget, *pOutput;
capBox->image_size = capBox->height * capBox->width * 3; capBox->image_size = capBox->height * capBox->width * 3;
if (!(capBox->image_data = heap_alloc(capBox->image_size))) if (!(capBox->image_data = heap_alloc(capBox->image_size)))
@ -414,9 +400,17 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
TRACE("Data length: %d KB\n", len / 1024); TRACE("Data length: %d KB\n", len / 1024);
IMediaSample_GetPointer(pSample, &pTarget); IMediaSample_GetPointer(pSample, &pTarget);
/* FIXME: Check return values.. */
V4l_GetFrame(capBox, &pInput); while (video_read(capBox->fd, capBox->image_data, capBox->image_size) == -1)
memcpy(pOutput, pInput, len); {
if (errno != EAGAIN)
{
ERR("Failed to read frame: %s\n", strerror(errno));
break;
}
}
memcpy(pOutput, capBox->image_data, len);
Resize(capBox, pTarget, pOutput); Resize(capBox, pTarget, pOutput);
hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample);
TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr);