rebase (pick): add support for WaveForm & Histogram

Author: wysaid

cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java

@@ -28,6 +28,8 @@ public class MainActivity extends AppCompatActivity {
 
     public static final String EFFECT_CONFIGS[] = {
             "",
+            "@style waveform 0.5 0.5 200. 150. 0.0 0.0 0.0 0.9",
+            "@style hist 0.5 0.5 200. 150. 0.0 0.0 0.0 ",
             "@curve RGB(0,255)(255,0) @style cm mapping0.jpg 80 80 8 3", // ASCII art (字符画效果)
             "@beautify face 1 480 640", //Beautify
             "@adjust lut edgy_amber.png",

library/src/main/jni/Android.mk

@@ -73,6 +73,10 @@ LOCAL_SRC_FILES :=  \
 			$(CGE_SOURCE)/filters/cgeHalftoneFilter.cpp \
 			$(CGE_SOURCE)/filters/cgeEdgeFilter.cpp \
 			$(CGE_SOURCE)/filters/cgeEmbossFilter.cpp \
+			\
+			$(CGE_SOURCE)/filters/cgeHistogramFilter.cpp \
+			$(CGE_SOURCE)/filters/cgeWaveformFilter.cpp \
+			\
 			$(CGE_SOURCE)/filters/cgeCrosshatchFilter.cpp \
 			$(CGE_SOURCE)/filters/cgeLiquifyFilter.cpp \
 			$(CGE_SOURCE)/filters/cgeRandomBlurFilter.cpp \

library/src/main/jni/cge/filters/cgeAdvancedEffects.cpp

@@ -137,4 +137,13 @@ CGEBeautifyFilter* createBeautifyFilter()
     COMMON_FUNC(CGEBeautifyFilter);
 }
 
+CGEHistogramFilter* createHistogramFilter()
+{
+    COMMON_FUNC(CGEHistogramFilter);
+}
+
+CGEWaveformFilter* createWaveformFilter()
+{
+    COMMON_FUNC(CGEWaveformFilter);
+}
 } // namespace CGE

library/src/main/jni/cge/filters/cgeAdvancedEffects.h

@@ -15,13 +15,15 @@
 #include "cgeEmbossFilter.h"
 #include "cgeHalftoneFilter.h"
 #include "cgeHazeFilter.h"
+#include "cgeHistogramFilter.h"
 #include "cgeLerpblurFilter.h"
 #include "cgeLiquifyFilter.h"
 #include "cgeMosaicBlurFilter.h"
 #include "cgePolarPixellateFilter.h"
 #include "cgePolkaDotFilter.h"
 #include "cgeRandomBlurFilter.h"
 #include "cgeSketchFilter.h"
+#include "cgeWaveformFilter.h"
 
 namespace CGE
 {
@@ -48,6 +50,9 @@ CGELerpblurFilter* createLerpblurFilter();
 CGESketchFilter* createSketchFilter();
 
 CGEBeautifyFilter* createBeautifyFilter();
+
+CGEHistogramFilter* createHistogramFilter();
+CGEWaveformFilter* createWaveformFilter();
 } // namespace CGE
 
 #endif

library/src/main/jni/cge/filters/cgeDataParsingEngine.cpp

@@ -1093,6 +1093,44 @@ CGEImageFilterInterface* CGEDataParsingEngine::advancedStyleParser(const char* p
     {
         ADJUSTHELP_COMMON_FUNC2(pstr, CGECrosshatchFilter, setCrosshatchSpacing, setLineWidth);
     }
+    else if (strcmp(buffer, "hist") == 0)
+    {
+        float x, y, value1, value2, r, g, b;
+        if (sscanf(pstr, "%f%*c%f%*c%f%*c%f%*c%f%*c%f%*c%f", &x, &y, &value1, &value2, &r, &g, &b) != 7)
+        {
+            LOG_ERROR_PARAM(pstr);
+            return nullptr;
+        }
+
+        CGEHistogramFilter* filter = createHistogramFilter();
+        if (filter != nullptr)
+        {
+            proc = filter;
+            filter->setCenter(x, y);
+            filter->setXValue(value1);
+            filter->setYValue(value2);
+            filter->setColor(r, g, b);
+        }
+    }
+
+    else if (strcmp(buffer, "waveform") == 0)
+    {
+        float x, y, value1, value2, r, g, b, a = 1.0f;
+        if (sscanf(pstr, "%f%*c%f%*c%f%*c%f%*c%f%*c%f%*c%f%*c%f", &x, &y, &value1, &value2, &r, &g, &b, &a) < 7)
+        {
+            LOG_ERROR_PARAM(pstr);
+            return nullptr;
+        }
+
+        CGEWaveformFilter* filter = createWaveformFilter();
+        if (filter != nullptr)
+        {
+            proc = filter;
+            filter->setFormPosition(x, y);
+            filter->setFormSize(value1, value2);
+            filter->setColor(r, g, b, a);
+        }
+    }
     else if (strcmp(buffer, "edge") == 0)
     {
         ADJUSTHELP_COMMON_FUNC2(pstr, CGEEdgeSobelFilter, setIntensity, setStride);

library/src/main/jni/cge/filters/cgeHistogramFilter.cpp

@@ -0,0 +1,66 @@
+#include "cgeHistogramFilter.h"
+
+static CGEConstString s_fshHistogram = CGE_SHADER_STRING_PRECISION_M(
+    varying vec2 textureCoordinate;
+
+    uniform sampler2D inputImageTexture;
+
+    uniform vec2 center; //坐标系原点
+
+    uniform float xValue; //宽度(x轴长度)
+
+    uniform float yValue; //高度(y轴长度)
+
+    uniform vec3 bgColor; //背景颜色
+
+    void main() {
+        /**
+           在以center为原点，宽xValue，高yValue，背景色为bgColor的矩形框中绘制亮度直方图。如何在这个库的基础上实现？
+        */
+        gl_FragColor = texture2D(inputImageTexture, textureCoordinate);
+    });
+
+namespace CGE
+{
+CGEConstString CGEHistogramFilter::paramCenter = "center";
+CGEConstString CGEHistogramFilter::paramXValue = "xValue";
+CGEConstString CGEHistogramFilter::paramYValue = "yValue";
+CGEConstString CGEHistogramFilter::paramColor = "bgColor";
+
+bool CGEHistogramFilter::init()
+{
+    if (initShadersFromString(g_vshDefaultWithoutTexCoord, s_fshHistogram))
+    {
+        setCenter(0.5f, 0.5f);
+        setXValue(0.4f);
+        setYValue(0.3f);
+        setColor(0.0f, 0.0f, 0.0f);
+        return true;
+    }
+    return false;
+}
+
+void CGEHistogramFilter::setCenter(float x, float y)
+{
+    m_program.bind();
+    m_program.sendUniformf(paramCenter, x, y);
+}
+
+void CGEHistogramFilter::setXValue(float value)
+{
+    m_program.bind();
+    m_program.sendUniformf(paramXValue, value);
+}
+
+void CGEHistogramFilter::setYValue(float value)
+{
+    m_program.bind();
+    m_program.sendUniformf(paramYValue, value);
+}
+
+void CGEHistogramFilter::setColor(float r, float b, float g)
+{
+    m_program.bind();
+    m_program.sendUniformf(paramColor, r, b, g);
+}
+} // namespace CGE

library/src/main/jni/cge/filters/cgeHistogramFilter.h

@@ -0,0 +1,38 @@
+#ifndef _HISTOGRAMFILTER_H_
+#define _HISTOGRAMFILTER_H_
+
+#include "cgeImageFilter.h"
+
+namespace CGE
+{
+class CGEHistogramFilter : public CGEImageFilterInterface
+{
+public:
+    /**
+     * 坐标系原点, 默认 (0.5, 0.5)
+     */
+    void setCenter(float x, float y);
+    /**
+     * 宽度
+     */
+    void setXValue(float value);
+    /**
+     * 高度
+     */
+    void setYValue(float value);
+    /**
+     * 背景颜色
+     */
+    void setColor(float r, float b, float g);
+
+    bool init();
+
+protected:
+    static CGEConstString paramCenter;
+    static CGEConstString paramXValue;
+    static CGEConstString paramYValue;
+    static CGEConstString paramColor;
+};
+} // namespace CGE
+
+#endif

library/src/main/jni/cge/filters/cgeWaveformFilter.cpp

@@ -0,0 +1,86 @@
+#include "cgeWaveformFilter.h"
+
+#include <EGL/egl.h>
+
+static CGEConstString s_vshWaveform = "#version 310 es\n" CGE_SHADER_STRING_PRECISION_H(
+    layout(location = 0) in vec2 position;
+    layout(location = 0) out vec2 textureCoordinate;
+    void main() {
+        gl_Position = vec4(position, 0.0, 1.0);
+        textureCoordinate = (position.xy + 1.0) / 2.0;
+    });
+
+static CGEConstString s_fshWaveform = "#version 310 es\n" CGE_SHADER_STRING(
+    precision highp float;
+    precision highp int;
+    layout(location = 0) in vec2 textureCoordinate;
+    layout(binding = 0) uniform sampler2D inputImageTexture;
+    layout(rgba8, binding = 1) uniform writeonly image2D outputImageTexture;
+    layout(location = 0) out vec4 fragColor;
+
+    void main() {
+        fragColor = texture(inputImageTexture, textureCoordinate);
+
+        fragColor.r = 1.0;
+    });
+
+namespace CGE
+{
+CGEWaveformFilter::~CGEWaveformFilter()
+{
+}
+
+bool CGEWaveformFilter::init()
+{
+    if (initShadersFromString(s_vshWaveform, s_fshWaveform))
+    {
+        setFormPosition(0.5f, 0.5f);
+        setFormSize(0.4f, 0.3f);
+        setColor(0.0f, 0.0f, 0.0f, 0.5f);
+        m_drawer.reset(TextureDrawer::create());
+        return true;
+    }
+
+    CGE_LOG_ERROR(R"(CGEWaveformFilter::init failed. This filter needs GLES3.1 and later!
+ Only GLES 3.1+ support image store. 
+ You need to imp a fallback version which reading pixels every frame like `cgeColorMappingFilter`
+)");
+    CGE_LOG_ERROR("Failed Vertex Shader: %s\n", s_vshWaveform);
+    CGE_LOG_ERROR("Failed Fragment Shader: %s\n", s_fshWaveform);
+    return false;
+}
+
+void CGEWaveformFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint srcTexture, GLuint vertexBufferID)
+{
+    handler->setAsTarget();
+    m_program.bind();
+
+    /// 渲染不写入, 使用 imageStore 写入.
+    // glColorMask(false, false, false, false);
+
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
+    glActiveTexture(GL_TEXTURE0);
+    // glBindImageTexture(0, srcTexture, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
+    glBindTexture(GL_TEXTURE_2D, srcTexture);
+    // glActiveTexture(GL_TEXTURE1);
+    // glBindImageTexture(1, handler->getTargetTextureID(), 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
+    // glBindTexture(GL_TEXTURE_2D, handler->getTargetTextureID());
+    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+}
+
+void CGEWaveformFilter::setFormPosition(float left, float top)
+{
+    m_position = { left, top };
+}
+
+void CGEWaveformFilter::setFormSize(float width, float height)
+{
+    m_size = { width, height };
+}
+
+void CGEWaveformFilter::setColor(float r, float g, float b, float a)
+{
+    m_color = { r, g, b, a };
+}
+} // namespace CGE

library/src/main/jni/cge/filters/cgeWaveformFilter.h

@@ -0,0 +1,41 @@
+#ifndef _WAVEFORMFILTER_H_
+#define _WAVEFORMFILTER_H_
+
+#include "cgeImageFilter.h"
+#include "cgeTextureUtils.h"
+#include "cgeVec.h"
+
+namespace CGE
+{
+class CGEWaveformFilter : public CGEImageFilterInterface
+{
+public:
+    ~CGEWaveformFilter() override;
+
+    /**
+     * @brief 左上角的点
+     */
+    void setFormPosition(float left, float top);
+    /**
+     * @brief 相对大小
+     */
+    void setFormSize(float width, float height);
+
+    /**
+     * @brief 背景色
+     */
+    void setColor(float r, float g, float b, float a);
+
+    bool init() override;
+
+    void render2Texture(CGEImageHandlerInterface* handler, GLuint srcTexture, GLuint vertexBufferID) override;
+
+protected:
+    std::unique_ptr<TextureDrawer> m_drawer;
+    Vec2f m_position;
+    Vec2f m_size;
+    Vec4f m_color;
+};
+} // namespace CGE
+
+#endif