add TextureRenderer

kenneycode · kenneycode · commit b473da8d7df2 · 2020-04-01T23:14:53.000+08:00
diff --git a/app/src/main/assets/test_image_0.png b/app/src/main/assets/test_image_0.png
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/MainActivity.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/MainActivity.kt
@@ -11,6 +11,7 @@ import android.widget.Button
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import io.github.kenneycode.fusion.demo.SimpleActivity.Companion.KEY_SAMPLE_INDEX
+import io.github.kenneycode.fusion.util.BitmapUtil
 
 
 /**
@@ -28,7 +29,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        Util.context = applicationContext
+        BitmapUtil.context = applicationContext
 
         val samplesList = findViewById<RecyclerView>(R.id.list)
         val layoutManager = LinearLayoutManager(this)
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/Util.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/Util.kt
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleBasicUsage.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleBasicUsage.kt
@@ -6,17 +6,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.github.kenneycode.fusion.demo.R
-import io.github.kenneycode.fusion.demo.Util
+import io.github.kenneycode.fusion.util.BitmapUtil
 import io.github.kenneycode.fusion.framebuffer.FrameBufferPool
 
 import io.github.kenneycode.fusion.input.FusionImage
 import io.github.kenneycode.fusion.process.RenderChain
 import io.github.kenneycode.fusion.process.RenderPipeline
 import io.github.kenneycode.fusion.program.GLProgramPool
-import io.github.kenneycode.fusion.renderer.CropRenderer
-import io.github.kenneycode.fusion.renderer.GaussianBlurRenderer
-import io.github.kenneycode.fusion.renderer.LUTRenderer
-import io.github.kenneycode.fusion.renderer.ScaleRenderer
+import io.github.kenneycode.fusion.renderer.*
 import io.github.kenneycode.fusion.texture.TexturePool
 import kotlinx.android.synthetic.main.fragment_sample_fusion_gl_texture_view.*
 
@@ -42,14 +39,15 @@ class SampleBasicUsage : Fragment() {
 
         // 创建RenderChain并添加一些renderer
         val renderer = RenderChain()
-                .addRenderer(ScaleRenderer().apply { setFlip(false, true); setScale(0.8f) })
+                .addRenderer(ScaleRenderer().apply { setScale(0.8f) })
                 .addRenderer(CropRenderer().apply { setCropRect(0.1f, 0.9f, 0.8f, 0.2f) })
-                .addRenderer(LUTRenderer().apply { setLUTImage(Util.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
+                .addRenderer(LUTRenderer().apply { setLUTImage(BitmapUtil.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
                 .addRenderer(GaussianBlurRenderer().apply { setBlurRadius(10) })
+                .addRenderer(TextureRenderer().apply { setBitmap(BitmapUtil.decodeBitmapFromAssets("test_image_0.png")!!); setRenderRect(-1f, 1f, -0.5f, 0.8f) })
 
         // 创建RenderPipeline，连接输入、渲染器与输出
         renderPipeline = RenderPipeline
-                .input(FusionImage(Util.decodeBitmapFromAssets("test.png")!!))
+                .input(FusionImage(BitmapUtil.decodeBitmapFromAssets("test.png")!!))
                 .renderWith(renderer)
                 .useContext(fusionView)
                 .output(fusionView)
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleGLSurfaceViewUsage0.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleGLSurfaceViewUsage0.kt
@@ -9,7 +9,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.github.kenneycode.fusion.common.DataKeys
 import io.github.kenneycode.fusion.demo.R
-import io.github.kenneycode.fusion.demo.Util
+import io.github.kenneycode.fusion.util.BitmapUtil
 import io.github.kenneycode.fusion.framebuffer.FrameBufferPool
 import io.github.kenneycode.fusion.process.RenderGraph
 import io.github.kenneycode.fusion.program.GLProgramPool
@@ -84,7 +84,7 @@ class SampleGLSurfaceViewUsage0 : Fragment() {
                             }
 
                     // 创建图片输入源
-                    val bitmap = Util.decodeBitmapFromAssets("test.png")!!
+                    val bitmap = BitmapUtil.decodeBitmapFromAssets("test.png")!!
                     val buffer = ByteBuffer.allocate(bitmap.width * bitmap.height * 4)
                     bitmap.copyPixelsToBuffer(buffer)
                     buffer.position(0)
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleImageOffscreenRender.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleImageOffscreenRender.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.github.kenneycode.fusion.demo.R
-import io.github.kenneycode.fusion.demo.Util
+import io.github.kenneycode.fusion.util.BitmapUtil
 import io.github.kenneycode.fusion.framebuffer.FrameBufferPool
 import io.github.kenneycode.fusion.input.FusionImage
 import io.github.kenneycode.fusion.output.FusionBitmap
@@ -51,15 +51,15 @@ class SampleImageOffscreenRender : Fragment() {
         val renderer = RenderChain()
                 .addRenderer(ScaleRenderer().apply { setFlip(false, true); setScale(0.8f) })
                 .addRenderer(CropRenderer().apply { setCropRect(0.1f, 0.9f, 0.8f, 0.2f) })
-                .addRenderer(LUTRenderer().apply { setLUTImage(Util.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
+                .addRenderer(LUTRenderer().apply { setLUTImage(BitmapUtil.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
                 .addRenderer(GaussianBlurRenderer().apply { setBlurRadius(10) })
 
         // 输出bitmap
         val output = FusionBitmap()
 
         // 创建RenderPipeline，连接输入、渲染器与输出
         val renderPipeline = RenderPipeline
-                .input(FusionImage(Util.decodeBitmapFromAssets(sourceImagePath)!!))
+                .input(FusionImage(BitmapUtil.decodeBitmapFromAssets(sourceImagePath)!!))
                 .renderWith(renderer)
                 .output(output)
 
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleMVPMatrix.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleMVPMatrix.kt
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.github.kenneycode.fusion.common.DataKeys
 import io.github.kenneycode.fusion.demo.R
-import io.github.kenneycode.fusion.demo.Util
+import io.github.kenneycode.fusion.util.BitmapUtil
 import io.github.kenneycode.fusion.framebuffer.FrameBufferPool
 
 import io.github.kenneycode.fusion.process.RenderChain
@@ -88,7 +88,7 @@ class SampleMVPMatrix : Fragment() {
                             }
 
                     // 创建图片输入源
-                    val bitmap = Util.decodeBitmapFromAssets("test.png")!!
+                    val bitmap = BitmapUtil.decodeBitmapFromAssets("test.png")!!
                     val buffer = ByteBuffer.allocate(bitmap.width * bitmap.height * 4)
                     bitmap.copyPixelsToBuffer(buffer)
                     buffer.position(0)
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleVideo.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleVideo.kt
@@ -6,10 +6,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.github.kenneycode.fusion.demo.R
-import io.github.kenneycode.fusion.demo.Util
+import io.github.kenneycode.fusion.util.BitmapUtil
 import io.github.kenneycode.fusion.framebuffer.FrameBufferPool
 
-import io.github.kenneycode.fusion.input.FusionImage
 import io.github.kenneycode.fusion.input.FusionVideo
 import io.github.kenneycode.fusion.process.RenderChain
 import io.github.kenneycode.fusion.process.RenderPipeline
@@ -41,7 +40,7 @@ class SampleVideo : Fragment() {
         // 创建RenderChain并添加一些renderer
         val renderer = RenderChain()
                 .addRenderer(OES2RGBARenderer())
-                .addRenderer(LUTRenderer().apply { setLUTImage(Util.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
+                .addRenderer(LUTRenderer().apply { setLUTImage(BitmapUtil.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
                 .addRenderer(GaussianBlurRenderer().apply { setBlurRadius(10) })
 
         // 创建RenderPipeline，连接输入、渲染器与输出
diff --git a/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleVideoOffscreenRender.kt b/app/src/main/java/io/github/kenneycode/fusion/demo/fragment/SampleVideoOffscreenRender.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.github.kenneycode.fusion.demo.R
-import io.github.kenneycode.fusion.demo.Util
+import io.github.kenneycode.fusion.util.BitmapUtil
 import io.github.kenneycode.fusion.framebuffer.FrameBufferPool
 import io.github.kenneycode.fusion.input.FusionVideoDecoder
 import io.github.kenneycode.fusion.output.FusionVideoEncoder
@@ -48,7 +48,7 @@ class SampleVideoOffscreenRender : Fragment() {
         // 创建RenderChain并添加一些renderer
         val renderer = RenderChain()
                 .addRenderer(OES2RGBARenderer())
-                .addRenderer(LUTRenderer().apply { setLUTImage(Util.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
+                .addRenderer(LUTRenderer().apply { setLUTImage(BitmapUtil.decodeBitmapFromAssets("test_lut.png")!!); setLUTStrength(0.8f) })
                 .addRenderer(GaussianBlurRenderer().apply { setBlurRadius(10) })
 
         // 视频解码器
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/input/FusionImage.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/input/FusionImage.kt
@@ -6,6 +6,7 @@ import io.github.kenneycode.fusion.context.GLContext
 import io.github.kenneycode.fusion.process.RenderPipeline
 import io.github.kenneycode.fusion.texture.Texture
 import io.github.kenneycode.fusion.texture.TexturePool
+import io.github.kenneycode.fusion.util.BitmapUtil
 import java.nio.ByteBuffer
 
 /**
@@ -33,7 +34,7 @@ class FusionImage(private val image: Bitmap) : RenderPipeline.Input, InputReceiv
 
     override fun onInit(glContext: GLContext, data: MutableMap<String, Any>) {
         val buffer = ByteBuffer.allocate(image.width * image.height * 4)
-        image.copyPixelsToBuffer(buffer)
+        BitmapUtil.flipBitmap(image, false, true).copyPixelsToBuffer(buffer)
         buffer.position(0)
         imageTexture = TexturePool.obtainTexture(image.width, image.height).apply {
             retain = true
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/parameter/BitmapTexture2DParameter.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/parameter/BitmapTexture2DParameter.kt
@@ -0,0 +1,37 @@
+package io.github.kenneycode.fusion.parameter
+
+import android.graphics.Bitmap
+import android.opengl.GLES20.*
+import android.util.Log
+import io.github.kenneycode.fusion.util.GLUtil
+import io.github.kenneycode.fusion.util.Util
+
+/**
+ *
+ * Coded by kenney
+ *
+ * http://www.github.com/kenneycode/fusion
+ *
+ * Bitmap shader uniform sampler2D 参数
+ *
+ */
+
+class BitmapTexture2DParameter(key: String, private var value: Bitmap, index: Int) : Texture2DParameter(key, 0, index) {
+
+    override fun onBind(location: Int) {
+        Util.assert(!value.isRecycled)
+        if (!glIsTexture(getValue() as Int)) {
+            super.update(GLUtil.bitmap2Texture(value, true))
+        }
+        super.onBind(location)
+    }
+
+    override fun update(value: Any) {
+        (value as? Bitmap)?.let {
+            if (this.value != it) {
+                GLUtil.deleteTexture(getValue() as Int)
+            }
+            this.value = it
+        }
+    }
+}
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/parameter/Parameter.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/parameter/Parameter.kt
@@ -34,6 +34,8 @@ abstract class Parameter(val key : String) {
      */
     protected abstract fun onBind(location: Int)
 
+    protected open fun getValue(): Any { return 0 }
+
     /**
      *
      * 更新参数
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/parameter/Texture2DParameter.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/parameter/Texture2DParameter.kt
@@ -11,11 +11,11 @@ import io.github.kenneycode.fusion.util.Util
  *
  * http://www.github.com/kenneycode/fusion
  *
- * Shader uniform sampler2D数组参数
+ * Shader uniform sampler2D参数
  *
  */
 
-class Texture2DParameter(key: String, private var value: Int, private val index: Int) : UniformParameter(key) {
+open class Texture2DParameter(key: String, private var value: Int, private val index: Int) : UniformParameter(key) {
 
     override fun onBind(location: Int) {
         Util.assert(glIsTexture(value))
@@ -24,6 +24,10 @@ class Texture2DParameter(key: String, private var value: Int, private val index:
         glUniform1i(location, index)
     }
 
+    override fun getValue(): Any {
+        return value
+    }
+
     override fun update(value: Any) {
         (value as? Int)?.let {
             this.value = it
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/renderer/GLRenderer.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/renderer/GLRenderer.kt
@@ -1,5 +1,7 @@
 package io.github.kenneycode.fusion.renderer
 
+import android.graphics.Bitmap
+
 /**
  *
  * Coded by kenney
@@ -48,6 +50,16 @@ interface GLRenderer : Renderer {
      */
     fun setTextureCoordinates(textureCoordinates: FloatArray)
 
+    /**
+     *
+     * 设置 bitmap 纹理参数
+     *
+     * @param key 纹理参数名
+     * @param value bitmap
+     *
+     */
+    fun setUniformBitmapTexture2D(key: String, value: Bitmap, index: Int = 0)
+
     /**
      *
      * 设置纹理参数
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/renderer/SimpleRenderer.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/renderer/SimpleRenderer.kt
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/renderer/TextureRenderer.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/renderer/TextureRenderer.kt
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/util/BitmapUtil.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/util/BitmapUtil.kt
diff --git a/libfusion/src/main/java/io/github/kenneycode/fusion/util/GLUtil.kt b/libfusion/src/main/java/io/github/kenneycode/fusion/util/GLUtil.kt
