change some code package (2017-10-25)

README.md

@@ -108,28 +108,14 @@ compile 'com.shuyu:gsyVideoPlayer-ex_so:2.1.0'
 
 ## 五、近期版本
 
+### 2.1.1(2017-10-xx)
+* videoCache模式支持增加header
+* 调整部分代码路径，优化代码
+
 ### 2.1.0(2017-10-10)
 * 增加了视频帧合成gif功能（DEMO DetailControlActivity中）。
 * update ijkplayer 0.84
 
-### 2.0.9(2017-10-02)
-* 增加顶层效果渲染的动画效果。
-* 增加截图功能。
-* 增加自定义render支持。
-* 增加水印、多重播放等。
-
-
-### 2.0.8（2017-09-17）
-* 增加GSYBaseActivityDetail抽象类，方便detail模式集成。
-* 内部增加一些优化。
-* 增加简单滤镜功能支持。
-```
-1、全局设置
-GSYVideoType.setRenderType(GSYVideoType.GLSURFACE);
-2、设置滤镜
-player.setEffectFilter(new BarrelBlurEffect());
-```
-
 
 ### 更多版本请查阅：[版本更新说明](https://github.com/CarGuo/GSYVideoPlayer/blob/master/UPDATE_VERSION.md)
 

app/src/main/java/com/example/gsyvideoplayer/DetailControlActivity.java

@@ -15,11 +15,9 @@ import com.example.gsyvideoplayer.utils.CommonUtil;
 import com.example.gsyvideoplayer.utils.JumpUtils;
 import com.example.gsyvideoplayer.video.SampleControlVideo;
 import com.shuyu.gsyvideoplayer.GSYBaseActivityDetail;
-import com.shuyu.gsyvideoplayer.GSYRenderView;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoGifSaveListener;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
-import com.shuyu.gsyvideoplayer.listener.GSYVideoShotSaveListener;
 import com.shuyu.gsyvideoplayer.listener.LockClickListener;
 import com.shuyu.gsyvideoplayer.utils.Debuger;
 import com.shuyu.gsyvideoplayer.utils.FileUtils;
@@ -28,10 +26,6 @@ import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/com/example/gsyvideoplayer/DetailFilterActivity.java

 package com.example.gsyvideoplayer;
 
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.opengl.Matrix;
 import android.os.Bundle;
@@ -17,39 +16,37 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.example.gsyvideoplayer.effect.BitmapIconEffect;
 import com.example.gsyvideoplayer.effect.GSYVideoGLViewCustomRender;
-import com.example.gsyvideoplayer.effect.GSYVideoGLViewCustomRender2;
-import com.example.gsyvideoplayer.effect.GSYVideoGLViewCustomRender3;
 import com.example.gsyvideoplayer.effect.PixelationEffect;
 import com.example.gsyvideoplayer.utils.CommonUtil;
 import com.example.gsyvideoplayer.video.SampleControlVideo;
 import com.shuyu.gsyvideoplayer.GSYBaseActivityDetail;
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
-import com.shuyu.gsyvideoplayer.effect.AutoFixEffect;
-import com.shuyu.gsyvideoplayer.effect.BarrelBlurEffect;
-import com.shuyu.gsyvideoplayer.effect.BlackAndWhiteEffect;
-import com.shuyu.gsyvideoplayer.effect.BrightnessEffect;
-import com.shuyu.gsyvideoplayer.effect.ContrastEffect;
-import com.shuyu.gsyvideoplayer.effect.CrossProcessEffect;
-import com.shuyu.gsyvideoplayer.effect.DocumentaryEffect;
-import com.shuyu.gsyvideoplayer.effect.DuotoneEffect;
-import com.shuyu.gsyvideoplayer.effect.FillLightEffect;
-import com.shuyu.gsyvideoplayer.effect.GammaEffect;
-import com.shuyu.gsyvideoplayer.effect.GaussianBlurEffect;
-import com.shuyu.gsyvideoplayer.effect.GrainEffect;
-import com.shuyu.gsyvideoplayer.effect.HueEffect;
-import com.shuyu.gsyvideoplayer.effect.InvertColorsEffect;
-import com.shuyu.gsyvideoplayer.effect.LamoishEffect;
-import com.shuyu.gsyvideoplayer.effect.NoEffect;
-import com.shuyu.gsyvideoplayer.effect.OverlayEffect;
-import com.shuyu.gsyvideoplayer.effect.PosterizeEffect;
-import com.shuyu.gsyvideoplayer.effect.SampleBlurEffect;
-import com.shuyu.gsyvideoplayer.effect.SaturationEffect;
-import com.shuyu.gsyvideoplayer.effect.SepiaEffect;
-import com.shuyu.gsyvideoplayer.effect.SharpnessEffect;
-import com.shuyu.gsyvideoplayer.effect.TemperatureEffect;
-import com.shuyu.gsyvideoplayer.effect.TintEffect;
-import com.shuyu.gsyvideoplayer.effect.VignetteEffect;
+import com.shuyu.gsyvideoplayer.render.effect.AutoFixEffect;
+import com.shuyu.gsyvideoplayer.render.effect.BarrelBlurEffect;
+import com.shuyu.gsyvideoplayer.render.effect.BlackAndWhiteEffect;
+import com.shuyu.gsyvideoplayer.render.effect.BrightnessEffect;
+import com.shuyu.gsyvideoplayer.render.effect.ContrastEffect;
+import com.shuyu.gsyvideoplayer.render.effect.CrossProcessEffect;
+import com.shuyu.gsyvideoplayer.render.effect.DocumentaryEffect;
+import com.shuyu.gsyvideoplayer.render.effect.DuotoneEffect;
+import com.shuyu.gsyvideoplayer.render.effect.FillLightEffect;
+import com.shuyu.gsyvideoplayer.render.effect.GammaEffect;
+import com.shuyu.gsyvideoplayer.render.effect.GaussianBlurEffect;
+import com.shuyu.gsyvideoplayer.render.effect.GrainEffect;
+import com.shuyu.gsyvideoplayer.render.effect.HueEffect;
+import com.shuyu.gsyvideoplayer.render.effect.InvertColorsEffect;
+import com.shuyu.gsyvideoplayer.render.effect.LamoishEffect;
+import com.shuyu.gsyvideoplayer.render.effect.NoEffect;
+import com.shuyu.gsyvideoplayer.render.effect.OverlayEffect;
+import com.shuyu.gsyvideoplayer.render.effect.PosterizeEffect;
+import com.shuyu.gsyvideoplayer.render.effect.SampleBlurEffect;
+import com.shuyu.gsyvideoplayer.render.effect.SaturationEffect;
+import com.shuyu.gsyvideoplayer.render.effect.SepiaEffect;
+import com.shuyu.gsyvideoplayer.render.effect.SharpnessEffect;
+import com.shuyu.gsyvideoplayer.render.effect.TemperatureEffect;
+import com.shuyu.gsyvideoplayer.render.effect.TintEffect;
+import com.shuyu.gsyvideoplayer.render.effect.VignetteEffect;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
 import com.shuyu.gsyvideoplayer.listener.LockClickListener;
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType;

app/src/main/java/com/example/gsyvideoplayer/effect/BitmapEffect.java

@@ -2,7 +2,7 @@ package com.example.gsyvideoplayer.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

app/src/main/java/com/example/gsyvideoplayer/effect/BitmapIconEffect.java

@@ -2,9 +2,8 @@ package com.example.gsyvideoplayer.effect;
 
 import android.graphics.Bitmap;
 import android.opengl.GLSurfaceView;
-import android.opengl.Matrix;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

app/src/main/java/com/example/gsyvideoplayer/effect/GSYVideoGLViewCustomRender.java

@@ -6,7 +6,7 @@ import android.opengl.GLES20;
 import android.opengl.GLUtils;
 import android.opengl.Matrix;
 
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewSimpleRender;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewSimpleRender;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

app/src/main/java/com/example/gsyvideoplayer/effect/GSYVideoGLViewCustomRender2.java

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
 
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewSimpleRender;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewSimpleRender;
 
 import javax.microedition.khronos.opengles.GL10;
 

app/src/main/java/com/example/gsyvideoplayer/effect/GSYVideoGLViewCustomRender3.java

@@ -5,14 +5,9 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
-import android.opengl.Matrix;
 
 import com.example.gsyvideoplayer.R;
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewSimpleRender;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewSimpleRender;
 
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;

app/src/main/java/com/example/gsyvideoplayer/effect/PixelationEffect.java

@@ -18,7 +18,7 @@ package com.example.gsyvideoplayer.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 
 /**
  * 马赛克效果

dependencies.gradle

@@ -22,7 +22,7 @@ ext {
     transitionseverywhere = '1.7.0'
 
     //DataLibraries
-    videocache = '2.7.0'
+    videocache = '2.1.1'
     leakcanary = '1.5'
 
     imageLoader = '4.0.0'
@@ -56,7 +56,7 @@ ext {
     ]
 
     dataDependencies = [
-            videocache: "com.danikula:videocache:${videocache}",
+            videocache: "com.shuyu:gsyvideoplayer-androidvideocache:${videocache}",
             leakcanary: "com.squareup.leakcanary:leakcanary-android:${leakcanary}",
     ]
 }

gsyVideoPlayer-java/build.gradle

@@ -35,8 +35,8 @@ dependencies {
     compile viewDependencies.ijkplayer_java
     compile viewDependencies.ijkplayer_exo
     compile viewDependencies.transitionseverywhere
-    //compile dataDependencies.videocache
-    compile project(':gsyvideoplayer-androidvideocache')
+    compile dataDependencies.videocache
+    //compile project(':gsyvideoplayer-androidvideocache')
     compile androidDependencies.appcompat_v7
 }
 

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYPreViewManager.java

@@ -21,7 +21,7 @@ import tv.danmaku.ijk.media.player.IjkMediaPlayer;
  * 小窗口预览管理
  * Created by shuyu on 2016/12/11.
  */
-
+@Deprecated
 public class GSYPreViewManager implements IMediaPlayer.OnPreparedListener, IjkMediaPlayer.OnSeekCompleteListener {
 
     public static String TAG = "GSYPreViewManager";

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/builder/GSYVideoOptionBuilder.java

@@ -3,8 +3,8 @@ package com.shuyu.gsyvideoplayer.builder;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
-import com.shuyu.gsyvideoplayer.effect.NoEffect;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.effect.NoEffect;
 import com.shuyu.gsyvideoplayer.listener.LockClickListener;
 import com.shuyu.gsyvideoplayer.listener.StandardVideoAllCallBack;
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYRenderView.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/GSYRenderView.java

-package com.shuyu.gsyvideoplayer;
+package com.shuyu.gsyvideoplayer.render;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
-import android.media.ThumbnailUtils;
 import android.view.Gravity;
 import android.view.SurfaceHolder;
 import android.view.TextureView;
@@ -13,19 +11,16 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
-import com.shuyu.gsyvideoplayer.listener.GSYVideoGifSaveListener;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotSaveListener;
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewBaseRender;
-import com.shuyu.gsyvideoplayer.utils.AnimatedGifEncoder;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewBaseRender;
+import com.shuyu.gsyvideoplayer.render.view.GSYSurfaceView;
+import com.shuyu.gsyvideoplayer.render.view.GSYTextureView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 import com.shuyu.gsyvideoplayer.utils.FileUtils;
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
 
 /**
  * render绘制中间控件

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/AutoFixEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/AutoFixEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Attempts to auto-fix the video based on histogram equalization.

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/BarrelBlurEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/BarrelBlurEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 
 /**
  * Barrel类型模糊

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/BlackAndWhiteEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/BlackAndWhiteEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * 黑白滤镜，

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/BrightnessEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/BrightnessEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/ContrastEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/ContrastEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Adjusts the contrast of the video.

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/CrossProcessEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/CrossProcessEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/DocumentaryEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/DocumentaryEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 import java.util.Date;
 import java.util.Random;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/DuotoneEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/DuotoneEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.graphics.Color;
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/FillLightEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/FillLightEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/GammaEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/GammaEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Apply Gamma Effect on Video being played

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/GaussianBlurEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/GaussianBlurEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * 高斯模糊

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/GrainEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/GrainEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 import java.util.Date;
 import java.util.Random;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/GreyScaleEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/GreyScaleEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/HueEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/HueEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/InvertColorsEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/InvertColorsEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/LamoishEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/LamoishEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 import java.util.Date;
 import java.util.Random;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/NoEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/NoEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/OverlayEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/OverlayEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 
 /**
  * 重叠

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/PosterizeEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/PosterizeEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/SampleBlurEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/SampleBlurEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 
 /**
  * 简单模糊

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/SaturationEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/SaturationEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Adjusts color saturation of video. There is still some issue with this

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/SepiaEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/SepiaEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Converts video to Sepia tone.

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/SharpnessEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/SharpnessEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Sharpens the video.

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/TemperatureEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/TemperatureEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 /**
  * Adjusts color temperature of the video.

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/TintEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/TintEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.graphics.Color;
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/effect/VignetteEffect.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/effect/VignetteEffect.java

-package com.shuyu.gsyvideoplayer.effect;
+package com.shuyu.gsyvideoplayer.render.effect;
 
 import android.opengl.GLSurfaceView;
 
-import  com.shuyu.gsyvideoplayer.GSYVideoGLView.ShaderInterface;
+import  com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView.ShaderInterface;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/GSYVideoGLViewBaseRender.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/glrender/GSYVideoGLViewBaseRender.java

-package com.shuyu.gsyvideoplayer.render;
+package com.shuyu.gsyvideoplayer.render.glrender;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES20;
 import android.opengl.GLException;
 import android.opengl.GLSurfaceView;
-import android.opengl.GLUtils;
-import android.opengl.Matrix;
-import android.util.Log;
 import android.view.Surface;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
-import com.shuyu.gsyvideoplayer.R;
-import com.shuyu.gsyvideoplayer.effect.NoEffect;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
 import com.shuyu.gsyvideoplayer.utils.Debuger;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
 

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/GSYVideoGLViewSimpleRender.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/glrender/GSYVideoGLViewSimpleRender.java

-package com.shuyu.gsyvideoplayer.render;
+package com.shuyu.gsyvideoplayer.render.glrender;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
@@ -7,8 +7,8 @@ import android.opengl.GLES20;
 import android.opengl.Matrix;
 import android.view.Surface;
 
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
-import com.shuyu.gsyvideoplayer.effect.NoEffect;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.effect.NoEffect;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
 
 import java.nio.ByteBuffer;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYSurfaceView.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/view/GSYSurfaceView.java

-package com.shuyu.gsyvideoplayer;
+package com.shuyu.gsyvideoplayer.render.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.SurfaceView;
 
+import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.utils.MeasureHelper;
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYTextureView.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/view/GSYTextureView.java

-package com.shuyu.gsyvideoplayer;
+package com.shuyu.gsyvideoplayer.render.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.TextureView;
 
+import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.utils.Debuger;
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType;
 import com.shuyu.gsyvideoplayer.utils.MeasureHelper;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoGLView.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/render/view/GSYVideoGLView.java

-package com.shuyu.gsyvideoplayer;
+package com.shuyu.gsyvideoplayer.render.view;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Paint;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
 import android.view.Surface;
 
+import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewBaseRender;
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewSimpleRender;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewBaseRender;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewSimpleRender;
 import com.shuyu.gsyvideoplayer.utils.MeasureHelper;
-import com.shuyu.gsyvideoplayer.effect.NoEffect;
+import com.shuyu.gsyvideoplayer.render.effect.NoEffect;
 
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/CustomGSYVideoPlayer.java

@@ -10,7 +10,7 @@ import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 
 import com.shuyu.gsyvideoplayer.GSYPreViewManager;
-import com.shuyu.gsyvideoplayer.GSYTextureView;
+import com.shuyu.gsyvideoplayer.render.view.GSYTextureView;
 import com.shuyu.gsyvideoplayer.R;
 import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer;
 

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java

@@ -4,10 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
-import android.media.ThumbnailUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -20,25 +17,16 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 
-import com.shuyu.gsyvideoplayer.GSYTextureView;
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
 import com.shuyu.gsyvideoplayer.R;
-import com.shuyu.gsyvideoplayer.listener.GSYVideoGifSaveListener;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotListener;
 import com.shuyu.gsyvideoplayer.listener.GSYVideoShotSaveListener;
 import com.shuyu.gsyvideoplayer.listener.StandardVideoAllCallBack;
-import com.shuyu.gsyvideoplayer.utils.AnimatedGifEncoder;
 import com.shuyu.gsyvideoplayer.utils.Debuger;
-import com.shuyu.gsyvideoplayer.utils.FileUtils;
 import com.shuyu.gsyvideoplayer.utils.NetworkUtils;
 import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer;
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
 
 import moe.codeest.enviews.ENDownloadView;
 import moe.codeest.enviews.ENPlayView;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java

@@ -15,7 +15,7 @@ import android.widget.FrameLayout;
 
 import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.R;
-import com.shuyu.gsyvideoplayer.SmallVideoTouch;
+import com.shuyu.gsyvideoplayer.view.SmallVideoTouch;
 import com.shuyu.gsyvideoplayer.utils.CommonUtil;
 import com.shuyu.gsyvideoplayer.utils.Debuger;
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils;

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYTextureRenderView.java

@@ -13,12 +13,11 @@ import android.view.TextureView;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.google.android.exoplayer.text.TextRenderer;
-import com.shuyu.gsyvideoplayer.GSYRenderView;
-import com.shuyu.gsyvideoplayer.GSYVideoGLView;
+import com.shuyu.gsyvideoplayer.render.GSYRenderView;
+import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView;
 import com.shuyu.gsyvideoplayer.GSYVideoManager;
-import com.shuyu.gsyvideoplayer.effect.NoEffect;
-import com.shuyu.gsyvideoplayer.render.GSYVideoGLViewBaseRender;
+import com.shuyu.gsyvideoplayer.render.effect.NoEffect;
+import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewBaseRender;
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType;
 
 /**

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/SmallVideoTouch.java → gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/view/SmallVideoTouch.java

-package com.shuyu.gsyvideoplayer;
+package com.shuyu.gsyvideoplayer.view;
 
 import android.view.MotionEvent;
 import android.view.View;