Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-fix: Grouped filters with filterCount%2==0 are flipped #231

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −19
Open

Re-fix: Grouped filters with filterCount%2==0 are flipped #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions library/src/jp/co/cyberagent/android/gpuimage/GPUImageFilterGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class GPUImageFilterGroup extends GPUImageFilter {

private final FloatBuffer mGLCubeBuffer;
private final FloatBuffer mGLTextureBuffer;
private final FloatBuffer mGLTextureFlipBuffer;

/**
* Instantiates a new GPUImageFilterGroup with no filters.
Expand Down Expand Up @@ -73,12 +72,6 @@ public GPUImageFilterGroup(List<GPUImageFilter> filters) {
.order(ByteOrder.nativeOrder())
.asFloatBuffer();
mGLTextureBuffer.put(TEXTURE_NO_ROTATION).position(0);

float[] flipTexture = TextureRotationUtil.getRotation(Rotation.NORMAL, false, true);
mGLTextureFlipBuffer = ByteBuffer.allocateDirect(flipTexture.length * 4)
.order(ByteOrder.nativeOrder())
.asFloatBuffer();
mGLTextureFlipBuffer.put(flipTexture).position(0);
}

public void addFilter(GPUImageFilter aFilter) {
Expand Down Expand Up @@ -199,8 +192,6 @@ public void onDraw(final int textureId, final FloatBuffer cubeBuffer,

if (i == 0) {
filter.onDraw(previousTexture, cubeBuffer, textureBuffer);
} else if (i == size - 1) {
filter.onDraw(previousTexture, mGLCubeBuffer, (size % 2 == 0) ? mGLTextureFlipBuffer : mGLTextureBuffer);
} else {
filter.onDraw(previousTexture, mGLCubeBuffer, mGLTextureBuffer);
}
Expand Down
17 changes: 15 additions & 2 deletions library/src/jp/co/cyberagent/android/gpuimage/OpenGlUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Matrix;
import android.hardware.Camera.Size;
import android.opengl.GLES20;
import android.opengl.GLUtils;
Expand All @@ -34,6 +35,9 @@ public static int loadTexture(final Bitmap img, final int usedTexId) {

public static int loadTexture(final Bitmap img, final int usedTexId, final boolean recycle) {
int textures[] = new int[1];

Bitmap flippedBitmap = flipBitmap(img);

if (usedTexId == NO_TEXTURE) {
GLES20.glGenTextures(1, textures, 0);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textures[0]);
Expand All @@ -46,15 +50,18 @@ public static int loadTexture(final Bitmap img, final int usedTexId, final boole
GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);

GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, img, 0);
GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, flippedBitmap, 0);
} else {
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, usedTexId);
GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, img);
GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, flippedBitmap);
textures[0] = usedTexId;
}
if (recycle) {
img.recycle();
}

flippedBitmap.recycle();

return textures[0];
}

Expand Down Expand Up @@ -138,4 +145,10 @@ public static float rnd(final float min, final float max) {
float fRandNum = (float) Math.random();
return min + (max - min) * fRandNum;
}

private static Bitmap flipBitmap(Bitmap bitmap) {
Matrix flip = new Matrix();
flip.postScale(1f, -1f);
return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), flip, true);
}
}
16 changes: 8 additions & 8 deletions library/src/jp/co/cyberagent/android/gpuimage/util/TextureRotationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@
public class TextureRotationUtil {

public static final float TEXTURE_NO_ROTATION[] = {
0.0f, 1.0f,
1.0f, 1.0f,
0.0f, 0.0f,
1.0f, 0.0f,
0.0f, 1.0f,
1.0f, 1.0f,
};

public static final float TEXTURE_ROTATED_90[] = {
1.0f, 1.0f,
1.0f, 0.0f,
0.0f, 1.0f,
1.0f, 1.0f,
0.0f, 0.0f,
0.0f, 1.0f,
};
public static final float TEXTURE_ROTATED_180[] = {
1.0f, 0.0f,
0.0f, 0.0f,
1.0f, 1.0f,
0.0f, 1.0f,
1.0f, 0.0f,
0.0f, 0.0f,
};
public static final float TEXTURE_ROTATED_270[] = {
0.0f, 0.0f,
0.0f, 1.0f,
1.0f, 0.0f,
0.0f, 0.0f,
1.0f, 1.0f,
1.0f, 0.0f,
};

private TextureRotationUtil() {
Expand Down