Merge branch 'master' into github_live

Change-Id: If98ad10e45eea5eef75b27548eb9af7de8eacbb5

Author: claywilkinson

visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera/CameraSource.java

@@ -760,7 +760,10 @@ private Camera createCamera() {
 
         Camera.Parameters parameters = camera.getParameters();
 
-        parameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
+        if (pictureSize != null) {
+            parameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
+        }
+
         parameters.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
         parameters.setPreviewFpsRange(
                 previewFpsRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
@@ -874,7 +877,9 @@ private static class SizePair {
         public SizePair(android.hardware.Camera.Size previewSize,
                         android.hardware.Camera.Size pictureSize) {
             mPreview = new Size(previewSize.width, previewSize.height);
-            mPicture = new Size(pictureSize.width, pictureSize.height);
+            if (pictureSize != null) {
+                mPicture = new Size(pictureSize.width, pictureSize.height);
+            }
         }
 
         public Size previewSize() {
@@ -1117,6 +1122,13 @@ void setNextFrame(byte[] data, Camera camera) {
                     mPendingFrameData = null;
                 }
 
+                if (!mBytesToByteBuffer.containsKey(data)) {
+                    Log.d(TAG,
+                        "Skipping frame.  Could not find ByteBuffer associated with the image " +
+                        "data from the camera.");
+                    return;
+                }
+
                 // Timestamp and frame ID are maintained here, which will give downstream code some
                 // idea of the timing of frames received and when frames were dropped along the way.
                 mPendingTimeMillis = SystemClock.elapsedRealtime() - mStartTimeMillis;
@@ -1149,7 +1161,7 @@ public void run() {
 
             while (true) {
                 synchronized (mLock) {
-                    if (mActive && (mPendingFrameData == null)) {
+                    while (mActive && (mPendingFrameData == null)) {
                         try {
                             // Wait for the next frame to be received from the camera, since we
                             // don't have it yet.