diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-11-15 09:17:29 -0800 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-11-15 09:17:29 -0800 |
| commit | 8d9a7a5fa4bd32f9b8aeb7b9e3bd047a475539ab (patch) | |
| tree | dd0a823549135e5b6184c44d19d8ad8754666845 /android/camera/camera-capture-mac.m | |
| parent | 9ef86366e076f45bb9a6e6e98651062bc3ad7da8 (diff) | |
| download | external_qemu-8d9a7a5fa4bd32f9b8aeb7b9e3bd047a475539ab.zip external_qemu-8d9a7a5fa4bd32f9b8aeb7b9e3bd047a475539ab.tar.gz external_qemu-8d9a7a5fa4bd32f9b8aeb7b9e3bd047a475539ab.tar.bz2 | |
Add required frame dimensions for Win and Mac.
Camera framework requires that certain frame dimensions must be supported by the
camera devices. Since on Windows and Mac we have no way of knowing the real
webcam capabilities, but camera API there pretty much allows us to choose any
frame dimensions that we want, we will hard-code those that are required by
the camera framework.
Change-Id: I625381776f374103d2ac1c62fabae23b1c5afa88
Diffstat (limited to 'android/camera/camera-capture-mac.m')
| -rw-r--r-- | android/camera/camera-capture-mac.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/camera/camera-capture-mac.m b/android/camera/camera-capture-mac.m index 1c1c3d5..228838b 100644 --- a/android/camera/camera-capture-mac.m +++ b/android/camera/camera-capture-mac.m @@ -494,8 +494,10 @@ static const CameraFrameDim _emulate_dims[] = { /* Emulates 640x480 frame. */ {640, 480}, - /* Emulates 320x240 frame. */ - {320, 240}, + /* Emulates 352x288 frame (required by camera framework). */ + {352, 288}, + /* Emulates 176x144 frame (required by camera framework). */ + {176, 144} }; /* Obtain default video device. QT API doesn't really provide a reliable |