ijksdl: add ffmpeg overlay to individal dir

ijkmediaplayer/jni/ijksdl/Android.mk

@@ -32,9 +32,10 @@ LOCAL_SRC_FILES += ijksdl_mutex.c
 LOCAL_SRC_FILES += ijksdl_stdinc.c
 LOCAL_SRC_FILES += ijksdl_thread.c
 LOCAL_SRC_FILES += ijksdl_timer.c
-LOCAL_SRC_FILES += ijksdl_vout_overlay_ffmpeg.c
 LOCAL_SRC_FILES += ijksdl_vout.c
 
+LOCAL_SRC_FILES += ffmpeg/ijksdl_vout_overlay_ffmpeg.c
+
 LOCAL_SRC_FILES += android/android_audiotrack.c
 LOCAL_SRC_FILES += android/android_nativewindow.c
 LOCAL_SRC_FILES += android/ijksdl_android_jni.c

ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c

@@ -26,9 +26,9 @@
 #include <assert.h>
 #include <android/native_window.h>
 #include "ijkutil/ijkutil.h"
-#include "../ijksdl_inc_ffmpeg.h"
 #include "../ijksdl_vout.h"
 #include "../ijksdl_vout_internal.h"
+#include "../ffmpeg/ijksdl_inc_ffmpeg.h"
 #include "ijksdl_inc_internal_android.h"
 
 static int sdl_copy_image_yv12_to_halyv12(ANativeWindow_Buffer *out_buffer, const SDL_VoutOverlay *overlay)

ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c

@@ -26,9 +26,9 @@
 #include <assert.h>
 #include <android/native_window.h>
 #include "ijkutil/ijkutil.h"
-#include "../ijksdl_inc_ffmpeg.h"
 #include "../ijksdl_vout.h"
 #include "../ijksdl_vout_internal.h"
+#include "../ffmpeg/ijksdl_inc_ffmpeg.h"
 #include "android_nativewindow.h"
 
 typedef struct SDL_VoutSurface_Opaque {

ijkmediaplayer/jni/ijksdl/ijksdl_inc_ffmpeg.h → ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h

@@ -28,6 +28,6 @@
 #include "libavcodec/avcodec.h"
 #include "libswscale/swscale.h"
 
-#include "ijksdl_inc_internal.h"
+#include "../ijksdl_inc_internal.h"
 
 #endif

ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.c → ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c

@@ -23,10 +23,10 @@
 
 #include "ijksdl_vout_overlay_ffmpeg.h"
 
-#include "ijksdl_stdinc.h"
+#include "../ijksdl_stdinc.h"
+#include "../ijksdl_mutex.h"
+#include "../ijksdl_vout_internal.h"
 #include "ijksdl_inc_ffmpeg.h"
-#include "ijksdl_mutex.h"
-#include "ijksdl_vout_internal.h"
 
 typedef struct SDL_VoutOverlay_Opaque {
     SDL_mutex *mutex;

ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.h → ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h

@@ -24,10 +24,12 @@
 #ifndef IJKSDL__IJKSDL_VOUT_OVERLAY_FFMPEG_H
 #define IJKSDL__IJKSDL_VOUT_OVERLAY_FFMPEG_H
 
-#include "ijksdl_stdinc.h"
-#include "ijksdl_vout.h"
+#include "../ijksdl_stdinc.h"
+#include "../ijksdl_vout.h"
 
 // TODO: 9 setup overlay stride to speed up memcpy
 SDL_VoutOverlay *SDL_VoutCreateFFmpegYUVOverlay(int width, int height, Uint32 format, SDL_Vout *display);
 
+SDL_VoutOverlay *SDL_VoutCreateBestFFmpegYUVOverlay(int width, int height, Uint32 format, SDL_Vout *display);
+
 #endif

ijkmediaplayer/jni/ijksdl/ijksdl.h

@@ -32,6 +32,7 @@
 #include "ijksdl_timer.h"
 #include "ijksdl_video.h"
 #include "ijksdl_vout.h"
-#include "ijksdl_vout_overlay_ffmpeg.h"
+
+#include "ffmpeg/ijksdl_vout_overlay_ffmpeg.h"
 
 #endif