Skip to content

Commit e83250b

Browse files
wasabeefwasabeef
committed
Merge pull request cats-oss#142 from CyberAgent/develop
1.2.2-SNAPSHOT released
2 parents d6e3aea + f459395 commit e83250b

File tree

8 files changed

+42
-42
lines changed

8 files changed

+42
-42
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
}
2020
2121
dependencies {
22-
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.1-SNAPSHOT'
22+
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.2-SNAPSHOT@aar'
2323
}
2424
```
2525

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.1-SNAPSHOT
1+
1.2.2-SNAPSHOT

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=1.2.1-SNAPSHOT
2-
VERSION_CODE=5
1+
VERSION_NAME=1.2.2-SNAPSHOT
2+
VERSION_CODE=6
33
GROUP=jp.co.cyberagent.android.gpuimage
44

55
COMPILE_SDK_VERSION=21

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Nov 18 22:06:02 JST 2014
1+
#Sat Dec 06 18:27:05 JST 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

‎library/jni/yuv-decoder.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ JNIEXPORT void JNICALL Java_jp_co_cyberagent_android_gpuimage_GPUImageNativeLibr
3636
Cr = yuv[cOff + 1];
3737
if(Cr < 0) Cr += 127; else Cr -= 128;
3838
}
39-
R = Y + Cr + (Cr >> 2) + (Cr >> 3) + (Cr >> 5);
39+
R = Y + Cr + (Cr >> 3) + (Cr >> 6);
4040
if(R < 0) R = 0; else if(R > 255) R = 255;
41-
G = Y - (Cb >> 2) + (Cb >> 4) + (Cb >> 5) - (Cr >> 1) + (Cr >> 3) + (Cr >> 4) + (Cr >> 5);
41+
G = Y - (Cb >> 1) + (Cb >> 4) + (Cb >> 5) - Cr + (Cr >> 2) + (Cr >> 3) + (Cr >> 5) + + (Cr >> 6);
4242
if(G < 0) G = 0; else if(G > 255) G = 255;
43-
B = Y + Cb + (Cb >> 1) + (Cb >> 2) + (Cb >> 6);
43+
B = Y + (Cb << 1) + (Cb >> 5);
4444
if(B < 0) B = 0; else if(B > 255) B = 255;
4545
rgbData[pixPtr++] = 0xff000000 + (R << 16) + (G << 8) + B;
4646
}
@@ -84,11 +84,11 @@ JNIEXPORT void JNICALL Java_jp_co_cyberagent_android_gpuimage_GPUImageNativeLibr
8484
Cr = yuv[cOff + 1];
8585
if(Cr < 0) Cr += 127; else Cr -= 128;
8686
}
87-
R = Y + Cr + (Cr >> 2) + (Cr >> 3) + (Cr >> 5);
87+
R = Y + Cr + (Cr >> 3) + (Cr >> 6);
8888
if(R < 0) R = 0; else if(R > 255) R = 255;
89-
G = Y - (Cb >> 2) + (Cb >> 4) + (Cb >> 5) - (Cr >> 1) + (Cr >> 3) + (Cr >> 4) + (Cr >> 5);
89+
G = Y - (Cb >> 1) + (Cb >> 4) + (Cb >> 5) - Cr + (Cr >> 2) + (Cr >> 3) + (Cr >> 5) + + (Cr >> 6);
9090
if(G < 0) G = 0; else if(G > 255) G = 255;
91-
B = Y + Cb + (Cb >> 1) + (Cb >> 2) + (Cb >> 6);
91+
B = Y + (Cb << 1) + (Cb >> 5);
9292
if(B < 0) B = 0; else if(B > 255) B = 255;
9393
rgbData[pixPtr++] = 0xff000000 + (B << 16) + (G << 8) + R;
9494
}

‎library/src/jp/co/cyberagent/android/gpuimage/GPUImage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.graphics.Bitmap.CompressFormat;
2626
import android.graphics.BitmapFactory;
2727
import android.graphics.Matrix;
28+
import android.graphics.PixelFormat;
2829
import android.hardware.Camera;
2930
import android.media.ExifInterface;
3031
import android.media.MediaScannerConnection;
@@ -92,6 +93,8 @@ private boolean supportsOpenGLES2(final Context context) {
9293
public void setGLSurfaceView(final GLSurfaceView view) {
9394
mGlSurfaceView = view;
9495
mGlSurfaceView.setEGLContextClientVersion(2);
96+
mGlSurfaceView.setEGLConfigChooser(8, 8, 8, 8, 16, 0);
97+
mGlSurfaceView.getHolder().setFormat(PixelFormat.RGBA_8888);
9598
mGlSurfaceView.setRenderer(mRenderer);
9699
mGlSurfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
97100
mGlSurfaceView.requestRender();

‎sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ repositories {
3434

3535
dependencies {
3636
compile project(':library')
37-
// compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:+'
37+
// compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:+@aar'
3838
compile 'com.android.support:support-v4:21.+'
3939
}

‎sample/src/jp/co/cyberagent/android/gpuimage/sample/activity/ActivityCamera.java

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@
1616

1717
package jp.co.cyberagent.android.gpuimage.sample.activity;
1818

19+
import android.app.Activity;
20+
import android.graphics.Bitmap;
21+
import android.graphics.BitmapFactory;
22+
import android.hardware.Camera;
23+
import android.hardware.Camera.CameraInfo;
24+
import android.hardware.Camera.Parameters;
25+
import android.net.Uri;
26+
import android.opengl.GLSurfaceView;
27+
import android.os.Bundle;
28+
import android.os.Environment;
29+
import android.util.Log;
30+
import android.view.View;
31+
import android.view.View.OnClickListener;
32+
import android.widget.SeekBar;
33+
import android.widget.SeekBar.OnSeekBarChangeListener;
34+
1935
import java.io.File;
2036
import java.io.FileNotFoundException;
2137
import java.io.FileOutputStream;
@@ -32,24 +48,8 @@
3248
import jp.co.cyberagent.android.gpuimage.sample.R;
3349
import jp.co.cyberagent.android.gpuimage.sample.utils.CameraHelper;
3450
import jp.co.cyberagent.android.gpuimage.sample.utils.CameraHelper.CameraInfo2;
35-
import android.app.Activity;
36-
import android.graphics.Bitmap;
37-
import android.graphics.BitmapFactory;
38-
import android.hardware.Camera;
39-
import android.hardware.Camera.CameraInfo;
40-
import android.hardware.Camera.Parameters;
41-
import android.net.Uri;
42-
import android.opengl.GLSurfaceView;
43-
import android.os.Bundle;
44-
import android.os.Environment;
45-
import android.util.Log;
46-
import android.view.View;
47-
import android.view.View.OnClickListener;
48-
import android.widget.SeekBar;
49-
import android.widget.SeekBar.OnSeekBarChangeListener;
5051

51-
public class ActivityCamera extends Activity implements OnSeekBarChangeListener,
52-
OnClickListener {
52+
public class ActivityCamera extends Activity implements OnSeekBarChangeListener, OnClickListener {
5353

5454
private GPUImage mGPUImage;
5555
private CameraHelper mCameraHelper;
@@ -105,7 +105,7 @@ public void onGpuImageFilterChosenListener(final GPUImageFilter filter) {
105105

106106
case R.id.button_capture:
107107
if (mCamera.mCameraInstance.getParameters().getFocusMode().equals(
108-
Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
108+
Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
109109
takePicture();
110110
} else {
111111
mCamera.mCameraInstance.autoFocus(new Camera.AutoFocusCallback() {
@@ -127,12 +127,10 @@ public void onAutoFocus(final boolean success, final Camera camera) {
127127
private void takePicture() {
128128
// TODO get a size that is about the size of the screen
129129
Camera.Parameters params = mCamera.mCameraInstance.getParameters();
130-
params.setPictureSize(1280, 960);
131130
params.setRotation(90);
132131
mCamera.mCameraInstance.setParameters(params);
133-
for (Camera.Size size2 : mCamera.mCameraInstance.getParameters()
134-
.getSupportedPictureSizes()) {
135-
Log.i("ASDF", "Supported: " + size2.width + "x" + size2.height);
132+
for (Camera.Size size : params.getSupportedPictureSizes()) {
133+
Log.i("ASDF", "Supported: " + size.width + "x" + size.height);
136134
}
137135
mCamera.mCameraInstance.takePicture(null, null,
138136
new Camera.PictureCallback() {
@@ -158,8 +156,7 @@ public void onPictureTaken(byte[] data, final Camera camera) {
158156
}
159157

160158
data = null;
161-
Bitmap bitmap = BitmapFactory.decodeFile(pictureFile
162-
.getAbsolutePath());
159+
Bitmap bitmap = BitmapFactory.decodeFile(pictureFile.getAbsolutePath());
163160
// mGPUImage.setImage(bitmap);
164161
final GLSurfaceView view = (GLSurfaceView) findViewById(R.id.surfaceView);
165162
view.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
@@ -225,7 +222,8 @@ private void switchFilterTo(final GPUImageFilter filter) {
225222
}
226223

227224
@Override
228-
public void onProgressChanged(final SeekBar seekBar, final int progress, final boolean fromUser) {
225+
public void onProgressChanged(final SeekBar seekBar, final int progress,
226+
final boolean fromUser) {
229227
if (mFilterAdjuster != null) {
230228
mFilterAdjuster.adjust(progress);
231229
}
@@ -240,6 +238,7 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
240238
}
241239

242240
private class CameraLoader {
241+
243242
private int mCurrentCameraId = 0;
244243
private Camera mCameraInstance;
245244

@@ -262,19 +261,17 @@ private void setUpCamera(final int id) {
262261
Parameters parameters = mCameraInstance.getParameters();
263262
// TODO adjust by getting supportedPreviewSizes and then choosing
264263
// the best one for screen size (best fill screen)
265-
parameters.setPreviewSize(720, 480);
266264
if (parameters.getSupportedFocusModes().contains(
267265
Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
268-
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
266+
parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
269267
}
270268
mCameraInstance.setParameters(parameters);
271269

272270
int orientation = mCameraHelper.getCameraDisplayOrientation(
273271
ActivityCamera.this, mCurrentCameraId);
274272
CameraInfo2 cameraInfo = new CameraInfo2();
275273
mCameraHelper.getCameraInfo(mCurrentCameraId, cameraInfo);
276-
boolean flipHorizontal = cameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT
277-
? true : false;
274+
boolean flipHorizontal = cameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT;
278275
mGPUImage.setUpCamera(mCameraInstance, orientation, flipHorizontal, false);
279276
}
280277

0 commit comments

Comments
 (0)