diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-11-15 13:47:39 -0800 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-11-15 13:47:39 -0800 |
| commit | e080a45d3e29e41bce06669b79d5eb04f0fd05ef (patch) | |
| tree | 2ecd769d77fc8966db2595478c7c11a04875f6fb /android | |
| parent | 8d9a7a5fa4bd32f9b8aeb7b9e3bd047a475539ab (diff) | |
| download | external_qemu-e080a45d3e29e41bce06669b79d5eb04f0fd05ef.zip external_qemu-e080a45d3e29e41bce06669b79d5eb04f0fd05ef.tar.gz external_qemu-e080a45d3e29e41bce06669b79d5eb04f0fd05ef.tar.bz2 | |
Add 320x240 frame support for Windows and Mac camera emulation
Change-Id: I54897ca86b372d98c7a30a47ecf88a4df8ee0fe9
Diffstat (limited to 'android')
| -rw-r--r-- | android/camera/camera-capture-mac.m | 2 | ||||
| -rwxr-xr-x | android/camera/camera-capture-windows.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/android/camera/camera-capture-mac.m b/android/camera/camera-capture-mac.m index 228838b..4d684e0 100644 --- a/android/camera/camera-capture-mac.m +++ b/android/camera/camera-capture-mac.m @@ -496,6 +496,8 @@ static const CameraFrameDim _emulate_dims[] = {640, 480}, /* Emulates 352x288 frame (required by camera framework). */ {352, 288}, + /* Emulates 320x240 frame (required by camera framework). */ + {320, 240}, /* Emulates 176x144 frame (required by camera framework). */ {176, 144} }; diff --git a/android/camera/camera-capture-windows.c b/android/camera/camera-capture-windows.c index 781ba05..ecf5b62 100755 --- a/android/camera/camera-capture-windows.c +++ b/android/camera/camera-capture-windows.c @@ -556,6 +556,8 @@ static const CameraFrameDim _emulate_dims[] = {640, 480}, /* Emulates 352x288 frame (required by camera framework). */ {352, 288}, + /* Emulates 320x240 frame (required by camera framework). */ + {320, 240}, /* Emulates 176x144 frame (required by camera framework). */ {176, 144} }; |