Permalink
Browse files

Remove GLES stuff

This is from now on to be found in the Spectaculum library.
  • Loading branch information...
1 parent b0147af commit c330244b2f4783567864d02328e0bea03c6683b5 @protyposis committed Aug 21, 2016
Showing with 34 additions and 9,118 deletions.
  1. +0 −6 .idea/gradle.xml
  2. +1 −1 .idea/misc.xml
  3. +0 −3 .idea/modules.xml
  4. +7 −6 MediaPlayer-DASH/MediaPlayer-DASH.iml
  5. +0 −1 MediaPlayer-GLES-FlowAbs/.gitignore
  6. +0 −17 MediaPlayer-GLES-FlowAbs/LICENSE_FLOWABS
  7. +0 −104 MediaPlayer-GLES-FlowAbs/MediaPlayer-GLES-FlowAbs.iml
  8. +0 −37 MediaPlayer-GLES-FlowAbs/build.gradle
  9. +0 −17 MediaPlayer-GLES-FlowAbs/proguard-rules.pro
  10. +0 −4 MediaPlayer-GLES-FlowAbs/src/main/AndroidManifest.xml
  11. +0 −47 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/bf_fs.glsl
  12. +0 −17 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/color_quantization_fs.glsl
  13. +0 −35 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/dog_fs.glsl
  14. +0 −38 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/fdog0_fs.glsl
  15. +0 −58 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/fdog1_fs.glsl
  16. +0 −23 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/gauss3x3_fs.glsl
  17. +0 −23 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/gauss5x5_fs.glsl
  18. +0 −31 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/gauss_fs.glsl
  19. +0 −37 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/lab2rgb_fs.glsl
  20. +0 −56 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/lic_fs.glsl
  21. +0 −13 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/mix_fs.glsl
  22. +0 −12 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/overlay_fs.glsl
  23. +0 −35 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/rgb2lab_fs.glsl
  24. +0 −33 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/sst_fs.glsl
  25. +0 −21 MediaPlayer-GLES-FlowAbs/src/main/assets/shaders/flowabs/tfm_fs.glsl
  26. +0 −72 ...lowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsBilateralFilterEffect.java
  27. +0 −64 ...wAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsColorQuantizationEffect.java
  28. +0 −80 ...layer-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsDOGEffect.java
  29. +0 −259 MediaPlayer-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsEffect.java
  30. +0 −97 ...ayer-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsFDOGEffect.java
  31. +0 −48 ...yer-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsGaussEffect.java
  32. +0 −33 ...S-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsNoiseTextureEffect.java
  33. +0 −56 ...er-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsSmoothEffect.java
  34. +0 −50 ...layer-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsSubEffect.java
  35. +0 −48 ...FlowAbs/src/main/java/net/protyposis/android/mediaplayer/effects/FlowAbsTangentFlowMapEffect.java
  36. +0 −54 ...src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/ColorQuantizationShaderProgram.java
  37. +0 −67 ...-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/DOGShaderProgram.java
  38. +0 −87 ...LES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/FDOG0ShaderProgram.java
  39. +0 −79 ...LES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/FDOG1ShaderProgram.java
  40. +0 −379 MediaPlayer-GLES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/FlowAbs.java
  41. +0 −60 ...S-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/FlowabsShaderProgram.java
  42. +0 −46 ...LES-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/GaussShaderProgram.java
  43. +0 −30 ...S-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/LAB2RGBShaderProgram.java
  44. +0 −71 ...in/java/net/protyposis/android/mediaplayer/gles/flowabs/LineIntegralConvolutionShaderProgram.java
  45. +0 −71 ...wAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/MixWithEdgesShaderProgram.java
  46. +0 −90 ...t/protyposis/android/mediaplayer/gles/flowabs/OrientationAlignedBilateralFilterShaderProgram.java
  47. +0 −60 ...S-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/OverlayShaderProgram.java
  48. +0 −30 ...S-FlowAbs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/RGB2LABShaderProgram.java
  49. +0 −117 ...bs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/RandomLuminanceNoiseTexture.java
  50. +0 −30 ...in/java/net/protyposis/android/mediaplayer/gles/flowabs/SmoothedStructureTensorShaderProgram.java
  51. +0 −30 ...bs/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/TangentFlowMapShaderProgram.java
  52. +0 −46 ...n/java/net/protyposis/android/mediaplayer/gles/flowabs/TextureColorQuantizationShaderProgram.java
  53. +0 −30 ...s/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/TextureGauss3x3ShaderProgram.java
  54. +0 −30 ...s/src/main/java/net/protyposis/android/mediaplayer/gles/flowabs/TextureGauss5x5ShaderProgram.java
  55. +0 −1 MediaPlayer-GLES-QrMarker/.gitignore
  56. +0 −28 MediaPlayer-GLES-QrMarker/LICENSE_QRMARKER
  57. +0 −104 MediaPlayer-GLES-QrMarker/MediaPlayer-GLES-QrMarker.iml
  58. +0 −37 MediaPlayer-GLES-QrMarker/build.gradle
  59. +0 −17 MediaPlayer-GLES-QrMarker/proguard-rules.pro
  60. +0 −4 MediaPlayer-GLES-QrMarker/src/main/AndroidManifest.xml
  61. +0 −101 MediaPlayer-GLES-QrMarker/src/main/assets/shaders/qrmarker/canny_new.glsl
  62. +0 −101 MediaPlayer-GLES-QrMarker/src/main/assets/shaders/qrmarker/consense.glsl
  63. +0 −91 MediaPlayer-GLES-QrMarker/src/main/assets/shaders/qrmarker/gauss.glsl
  64. +0 −79 MediaPlayer-GLES-QrMarker/src/main/assets/shaders/qrmarker/gradient.glsl
  65. +0 −106 MediaPlayer-GLES-QrMarker/src/main/assets/shaders/qrmarker/wideqr.glsl
  66. +0 −138 ...Player-GLES-QrMarker/src/main/java/net/protyposis/android/mediaplayer/effects/QrMarkerEffect.java
  67. +0 −29 ...S-QrMarker/src/main/java/net/protyposis/android/mediaplayer/gles/qrmarker/CannyShaderProgram.java
  68. +0 −29 ...rMarker/src/main/java/net/protyposis/android/mediaplayer/gles/qrmarker/ConsenseShaderProgram.java
  69. +0 −29 ...S-QrMarker/src/main/java/net/protyposis/android/mediaplayer/gles/qrmarker/GaussShaderProgram.java
  70. +0 −29 ...rMarker/src/main/java/net/protyposis/android/mediaplayer/gles/qrmarker/GradientShaderProgram.java
  71. +0 −115 ...rMarker/src/main/java/net/protyposis/android/mediaplayer/gles/qrmarker/QrMarkerShaderProgram.java
  72. +0 −29 ...arker/src/main/java/net/protyposis/android/mediaplayer/gles/qrmarker/QrResponseShaderProgram.java
  73. +0 −1 MediaPlayer-GLES/.gitignore
  74. +0 −104 MediaPlayer-GLES/MediaPlayer-GLES.iml
  75. +0 −37 MediaPlayer-GLES/build.gradle
  76. +0 −17 MediaPlayer-GLES/proguard-rules.pro
  77. +0 −4 MediaPlayer-GLES/src/main/AndroidManifest.xml
  78. +0 −28 MediaPlayer-GLES/src/main/assets/shaders/fs_adjust_contrast_brightness.s
  79. +0 −7 MediaPlayer-GLES/src/main/assets/shaders/fs_color.s
  80. +0 −8 MediaPlayer-GLES/src/main/assets/shaders/fs_texture.s
  81. +0 −17 MediaPlayer-GLES/src/main/assets/shaders/fs_texture_flip.s
  82. +0 −17 MediaPlayer-GLES/src/main/assets/shaders/fs_texture_kernel.s
  83. +0 −9 MediaPlayer-GLES/src/main/assets/shaders/fs_texture_readexternal.s
  84. +0 −41 MediaPlayer-GLES/src/main/assets/shaders/fs_texture_simpletoon.s
  85. +0 −40 MediaPlayer-GLES/src/main/assets/shaders/fs_texture_sobel.s
  86. +0 −11 MediaPlayer-GLES/src/main/assets/shaders/vs_color.s
  87. +0 −12 MediaPlayer-GLES/src/main/assets/shaders/vs_texture.s
  88. +0 −172 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/GLCameraView.java
  89. +0 −389 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/GLTextureView.java
  90. +0 −387 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/GLVideoView.java
  91. +0 −82 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/LibraryHelper.java
  92. +0 −98 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/BaseEffect.java
  93. +0 −57 .../src/main/java/net/protyposis/android/mediaplayer/effects/ContrastBrightnessAdjustmentEffect.java
  94. +0 −51 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/Effect.java
  95. +0 −49 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/FlipEffect.java
  96. +0 −77 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/FloatParameter.java
  97. +0 −77 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/IntegerParameter.java
  98. +0 −33 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/KernelBlurEffect.java
  99. +0 −33 ...aPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/KernelEdgeDetectEffect.java
  100. +0 −33 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/KernelEmbossEffect.java
  101. +0 −33 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/KernelGaussBlurEffect.java
  102. +0 −33 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/KernelSharpenEffect.java
  103. +0 −37 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/NoEffect.java
  104. +0 −64 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/Parameter.java
  105. +0 −65 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/ShaderEffect.java
  106. +0 −33 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/SimpleToonEffect.java
  107. +0 −85 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/effects/SobelEffect.java
  108. +0 −45 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/ColorShaderProgram.java
  109. +0 −116 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/ColoredRectangle.java
  110. +0 −54 .../main/java/net/protyposis/android/mediaplayer/gles/ContrastBrightnessAdjustmentShaderProgram.java
  111. +0 −103 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/ExternalSurfaceTexture.java
  112. +0 −63 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/FrameRateCalculator.java
  113. +0 −74 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/Framebuffer.java
  114. +0 −189 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/GLUtils.java
  115. +0 −270 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/GLVideoRenderer.java
  116. +0 −36 ...-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/ReadExternalTextureShaderProgram.java
  117. +0 −119 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/ShaderProgram.java
  118. +0 −58 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/Shape.java
  119. +0 −44 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/Texture.java
  120. +0 −92 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/Texture2D.java
  121. +0 −48 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/TextureFlipShaderProgram.java
  122. +0 −98 ...Player-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/TextureKernelShaderProgram.java
  123. +0 −72 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/TextureShaderProgram.java
  124. +0 −60 ...aPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/TextureSobelShaderProgram.java
  125. +0 −30 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/TextureToonShaderProgram.java
  126. +0 −110 MediaPlayer-GLES/src/main/java/net/protyposis/android/mediaplayer/gles/TexturedRectangle.java
  127. +7 −6 MediaPlayer/MediaPlayer.iml
  128. +18 −21 MediaPlayerDemo/MediaPlayerDemo.iml
  129. +0 −3 MediaPlayerDemo/build.gradle
  130. +0 −12 MediaPlayerDemo/src/main/AndroidManifest.xml
  131. +0 −59 MediaPlayerDemo/src/main/assets/licenses.html
  132. +0 −92 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/GLCameraViewActivity.java
  133. +0 −199 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/GLEffects.java
  134. +0 −249 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/GLVideoViewActivity.java
  135. +0 −21 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/MainActivity.java
  136. +0 −160 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/ParameterListAdapter.java
  137. +0 −24 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/Utils.java
  138. +0 −75 ...PlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/testeffect/ColorFilterEffect.java
  139. +0 −45 ...emo/src/main/java/net/protyposis/android/mediaplayerdemo/testeffect/ColorFilterShaderProgram.java
  140. +0 −63 MediaPlayerDemo/src/main/res/layout/activity_glcameraview.xml
  141. +0 −71 MediaPlayerDemo/src/main/res/layout/activity_glvideoview.xml
  142. +0 −23 MediaPlayerDemo/src/main/res/layout/activity_main.xml
  143. +0 −61 MediaPlayerDemo/src/main/res/layout/list_item_parameter_seekbar.xml
  144. +0 −48 MediaPlayerDemo/src/main/res/menu/glvideoview.xml
  145. +0 −7 MediaPlayerDemo/src/main/res/values/strings.xml
  146. +1 −1 settings.gradle
View
@@ -11,9 +11,6 @@
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/MediaPlayer" />
<option value="$PROJECT_DIR$/MediaPlayer-DASH" />
- <option value="$PROJECT_DIR$/MediaPlayer-GLES" />
- <option value="$PROJECT_DIR$/MediaPlayer-GLES-FlowAbs" />
- <option value="$PROJECT_DIR$/MediaPlayer-GLES-QrMarker" />
<option value="$PROJECT_DIR$/MediaPlayerDemo" />
</set>
</option>
@@ -22,9 +19,6 @@
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/MediaPlayer" />
<option value="$PROJECT_DIR$/MediaPlayer-DASH" />
- <option value="$PROJECT_DIR$/MediaPlayer-GLES" />
- <option value="$PROJECT_DIR$/MediaPlayer-GLES-FlowAbs" />
- <option value="$PROJECT_DIR$/MediaPlayer-GLES-QrMarker" />
<option value="$PROJECT_DIR$/MediaPlayerDemo" />
</set>
</option>
View
@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
View
@@ -5,9 +5,6 @@
<module fileurl="file://$PROJECT_DIR$/MediaCodecPlayer.iml" filepath="$PROJECT_DIR$/MediaCodecPlayer.iml" />
<module fileurl="file://$PROJECT_DIR$/MediaPlayer/MediaPlayer.iml" filepath="$PROJECT_DIR$/MediaPlayer/MediaPlayer.iml" />
<module fileurl="file://$PROJECT_DIR$/MediaPlayer-DASH/MediaPlayer-DASH.iml" filepath="$PROJECT_DIR$/MediaPlayer-DASH/MediaPlayer-DASH.iml" />
- <module fileurl="file://$PROJECT_DIR$/MediaPlayer-GLES/MediaPlayer-GLES.iml" filepath="$PROJECT_DIR$/MediaPlayer-GLES/MediaPlayer-GLES.iml" />
- <module fileurl="file://$PROJECT_DIR$/MediaPlayer-GLES-FlowAbs/MediaPlayer-GLES-FlowAbs.iml" filepath="$PROJECT_DIR$/MediaPlayer-GLES-FlowAbs/MediaPlayer-GLES-FlowAbs.iml" />
- <module fileurl="file://$PROJECT_DIR$/MediaPlayer-GLES-QrMarker/MediaPlayer-GLES-QrMarker.iml" filepath="$PROJECT_DIR$/MediaPlayer-GLES-QrMarker/MediaPlayer-GLES-QrMarker.iml" />
<module fileurl="file://$PROJECT_DIR$/MediaPlayerDemo/MediaPlayerDemo.iml" filepath="$PROJECT_DIR$/MediaPlayerDemo/MediaPlayerDemo.iml" />
</modules>
</component>
@@ -48,53 +48,54 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/docs" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
- <excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file://$MODULE_DIR$/build/publications" />
- <excludeFolder url="file://$MODULE_DIR$/build/reports" />
- <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
@@ -1 +0,0 @@
-/build
@@ -1,17 +0,0 @@
-The FlowAbs shaders have been copied, without modification,
-from flowabs at https://code.google.com/p/flowabs/,
-distributed under the following license:
-
-by Jan Eric Kyprianidis <www.kyprianidis.com>
-Copyright (C) 2008-2011 Computer Graphics Systems Group at the
-Hasso-Plattner-Institut, Potsdam, Germany <www.hpi3d.de>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":MediaPlayer-GLES-FlowAbs" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MediaCodecPlayer" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="android-gradle" name="Android-Gradle">
- <configuration>
- <option name="GRADLE_PROJECT_PATH" value=":MediaPlayer-GLES-FlowAbs" />
- </configuration>
- </facet>
- <facet type="android" name="Android">
- <configuration>
- <option name="SELECTED_BUILD_VARIANT" value="debug" />
- <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
- <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
- <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
- <afterSyncTasks>
- <task>generateDebugSources</task>
- </afterSyncTasks>
- <option name="ALLOW_USER_CONFIGURATION" value="false" />
- <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
- <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
- <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
- <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
- <option name="LIBRARY_PROJECT" value="true" />
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
- <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/docs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
- <excludeFolder url="file://$MODULE_DIR$/build/libs" />
- <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file://$MODULE_DIR$/build/publications" />
- <excludeFolder url="file://$MODULE_DIR$/build/reports" />
- <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
- </content>
- <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="MediaPlayer-GLES" exported="" />
- </component>
-</module>
@@ -1,37 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
-
-android {
- compileSdkVersion 22
- buildToolsVersion "22.0.1"
-
- defaultConfig {
- minSdkVersion 16
- targetSdkVersion 22
- versionCode libraryVersionCode
- versionName libraryVersionName
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile project(':MediaPlayer-GLES')
-}
-
-publish {
- userOrg = 'protyposis'
- groupId = playerModuleBase
- artifactId = 'mediaplayer-gles-flowabs'
- publishVersion = libraryVersionString()
- desc = 'MediaPlayer-Extended GLES FlowAbs shaders'
- website = 'https://github.com/protyposis/MediaPlayer-Extended'
- licences = ['GPL-3.0']
-}
-
-//apply from: "../gitversioning.gradle"
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:/Users/Mario/AppData/Local/Android/android-studio/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="net.protyposis.android.mediaplayer.gles.flowabs">
-
-</manifest>
@@ -1,47 +0,0 @@
-// by Jan Eric Kyprianidis <www.kyprianidis.com>
-uniform sampler2D img;
-uniform sampler2D tfm;
-uniform int pass;
-uniform float sigma_d;
-uniform float sigma_r;
-uniform vec2 img_size;
-
-void main (void) {
- float twoSigmaD2 = 2.0 * sigma_d * sigma_d;
- float twoSigmaR2 = 2.0 * sigma_r * sigma_r;
- vec2 uv = gl_FragCoord.xy / img_size;
-
- vec2 t = texture2D(tfm, uv).xy;
- vec2 dir = (pass == 0)? vec2(t.y, -t.x) : t;
- vec2 dabs = abs(dir);
- float ds = 1.0 / ((dabs.x > dabs.y)? dabs.x : dabs.y);
- dir /= img_size;
-
- vec3 center = texture2D(img, uv).rgb;
- vec3 sum = center;
- float norm = 1.0;
- float halfWidth = 2.0 * sigma_d;
- for (float d = ds; d <= halfWidth; d += ds) {
- vec3 c0 = texture2D(img, uv + d * dir).rgb;
- vec3 c1 = texture2D(img, uv - d * dir).rgb;
- float e0 = length(c0 - center);
- float e1 = length(c1 - center);
-
- float kerneld = exp( - d *d / twoSigmaD2 );
- float kernele0 = exp( - e0 *e0 / twoSigmaR2 );
- float kernele1 = exp( - e1 *e1 / twoSigmaR2 );
- norm += kerneld * kernele0;
- norm += kerneld * kernele1;
-
- sum += kerneld * kernele0 * c0;
- sum += kerneld * kernele1 * c1;
- }
- sum /= norm;
- //if (norm > 1.2)
- // sum /= norm;
- //else {
- // sum = (texture2D(img, uv + ds * dir).rgb +
- // texture2D(img, uv - ds * dir).rgb) / 2.0;
- //}
- gl_FragColor = vec4(sum, 1.0);
-}
Oops, something went wrong.

0 comments on commit c330244

Please sign in to comment.