prefer high res frame grabs on retina ipads

git-svn-id: https://zxing.googlecode.com/svn/trunk@2298 59b500cc-1b3d-0410-9834-0bbf25fbcc57

iphone/ZXingWidget/Classes/ZXingWidgetController.m

@@ -1,3 +1,4 @@
+// -*- mode:objc; c-basic-offset:2; indent-tabs-mode:nil -*-
 /**
  * Copyright 2009 Jeff Verkoeyen
  *
@@ -301,12 +302,30 @@
 #pragma mark - 
 #pragma mark AVFoundation
 
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+// Gross, I know, but ...
+static bool isIPad() {
+  static int is_ipad = -1;
+  if (is_ipad < 0) {
+    size_t size;
+    sysctlbyname("hw.machine", NULL, &size, NULL, 0); // Get size of data to be returned.
+    char *name = malloc(size);
+    sysctlbyname("hw.machine", name, &size, NULL, 0);
+    NSString *machine = [NSString stringWithCString:name encoding:NSASCIIStringEncoding];
+    free(name);
+    is_ipad = [machine hasPrefix:@"iPad"];
+  }
+  return !!is_ipad;
+}
+    
 - (void)initCapture {
 #if HAS_AVFF
+  AVCaptureDevice* inputDevice =
+    [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
   AVCaptureDeviceInput *captureInput =
-    [AVCaptureDeviceInput deviceInputWithDevice:
+    [AVCaptureDeviceInput deviceInputWithDevice:inputDevice error:nil];
-            [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo] 
-                                          error:nil];
   AVCaptureVideoDataOutput *captureOutput = [[AVCaptureVideoDataOutput alloc] init]; 
   captureOutput.alwaysDiscardsLateVideoFrames = YES; 
   [captureOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()];
@@ -315,7 +334,21 @@
   NSDictionary* videoSettings = [NSDictionary dictionaryWithObject:value forKey:key]; 
   [captureOutput setVideoSettings:videoSettings]; 
   self.captureSession = [[[AVCaptureSession alloc] init] autorelease];
-  self.captureSession.sessionPreset = AVCaptureSessionPresetMedium; // 480x360 on a 4
+
+  NSString* preset = 0;
+  if (NSClassFromString(@"NSOrderedSet") && // Proxy for "is this iOS 5" ...
+      [UIScreen mainScreen].scale > 1 &&
+      isIPad() && 
+      [inputDevice
+        supportsAVCaptureSessionPreset:AVCaptureSessionPresetiFrame960x540]) {
+    NSLog(@"960");
+    preset = AVCaptureSessionPresetiFrame960x540;
+  }
+  if (!preset) {
+    NSLog(@"MED");
+    preset = AVCaptureSessionPresetMedium;
+  }
+  self.captureSession.sessionPreset = preset;
 
   [self.captureSession addInput:captureInput];
   [self.captureSession addOutput:captureOutput];

objc/src/ZXing/ZXCapture.mm

@@ -39,6 +39,10 @@
 #define ZXMediaTypeVideo QTMediaTypeVideo
 #endif
 
+#if ZXAV(1)+0
+static bool isIPad();
+#endif
+
 @implementation ZXCapture
 
 @synthesize delegate;
@@ -128,6 +132,21 @@
   }
   
   if (input) {
+    ZXAV({
+        NSString* preset = 0;
+        if (NSClassFromString(@"NSOrderedSet") && // Proxy for "is this iOS 5" ...
+            [UIScreen mainScreen].scale > 1 &&
+            isIPad() && 
+            [zxd supportsAVCaptureSessionPreset:AVCaptureSessionPresetiFrame960x540]) {
+          // NSLog(@"960");
+          preset = AVCaptureSessionPresetiFrame960x540;
+        }
+        if (!preset) {
+          // NSLog(@"MED");
+          preset = AVCaptureSessionPresetMedium;
+        }
+        session.sessionPreset = preset;
+      });
     [session addInput:input ZXQT(error:nil)];
   }
 }
@@ -135,7 +154,6 @@
 - (ZXCaptureSession*)session {
   if (session == 0) {
     session = [[ZXCaptureSession alloc] init];
-    ZXAV({session.sessionPreset = AVCaptureSessionPresetMedium;});
     [self replaceInput];
   }
   return session;
@@ -553,6 +571,28 @@ ZXAV(didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer)
 
 @end
 
+// If you try to define this higher, there (seem to be) clashes with something(s) defined
+// in the includes ...
+
+#if ZXAV(1)+0
+#include <sys/types.h>
+#include <sys/sysctl.h>
+// Gross, I know, but ...
+static bool isIPad() {
+  static int is_ipad = -1;
+  if (is_ipad < 0) {
+    size_t size;
+    sysctlbyname("hw.machine", NULL, &size, NULL, 0); // Get size of data to be returned.
+    char* name = (char*)malloc(size);
+    sysctlbyname("hw.machine", name, &size, NULL, 0);
+    NSString *machine = [NSString stringWithCString:name encoding:NSASCIIStringEncoding];
+    free(name);
+    is_ipad = [machine hasPrefix:@"iPad"];
+  }
+  return !!is_ipad;
+}
+#endif
+    
 #else
 
 @implementation ZXCapture