From b491ba2c42de45cacea869bdaf5751007d7ef845 Mon Sep 17 00:00:00 2001
From: Zhang Rui <bbcallen@gmail.com>
Date: Thu, 27 Jun 2013 16:46:02 +0800
Subject: [PATCH] ijksdl: add ffmpeg overlay to individal dir

---
 ijkmediaplayer/jni/ijksdl/Android.mk                        | 3 ++-
 ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c    | 2 +-
 .../jni/ijksdl/android/ijksdl_vout_android_nativewindow.c   | 2 +-
 ijkmediaplayer/jni/ijksdl/{ => ffmpeg}/ijksdl_inc_ffmpeg.h  | 2 +-
 .../jni/ijksdl/{ => ffmpeg}/ijksdl_vout_overlay_ffmpeg.c    | 6 +++---
 .../jni/ijksdl/{ => ffmpeg}/ijksdl_vout_overlay_ffmpeg.h    | 6 ++++--
 ijkmediaplayer/jni/ijksdl/ijksdl.h                          | 3 ++-
 7 files changed, 14 insertions(+), 10 deletions(-)
 rename ijkmediaplayer/jni/ijksdl/{ => ffmpeg}/ijksdl_inc_ffmpeg.h (96%)
 rename ijkmediaplayer/jni/ijksdl/{ => ffmpeg}/ijksdl_vout_overlay_ffmpeg.c (98%)
 rename ijkmediaplayer/jni/ijksdl/{ => ffmpeg}/ijksdl_vout_overlay_ffmpeg.h (88%)

diff --git a/ijkmediaplayer/jni/ijksdl/Android.mk b/ijkmediaplayer/jni/ijksdl/Android.mk
index 532e4a31..b8fd83bc 100644
--- a/ijkmediaplayer/jni/ijksdl/Android.mk
+++ b/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
diff --git a/ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c b/ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
index 6e4014cc..7b83802c 100644
--- a/ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c
+++ b/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)
diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c
index 58a3e847..6705e2df 100644
--- a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c
+++ b/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 {
diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_inc_ffmpeg.h b/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h
similarity index 96%
rename from ijkmediaplayer/jni/ijksdl/ijksdl_inc_ffmpeg.h
rename to ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h
index ff4cb89c..cc5f86a3 100644
--- a/ijkmediaplayer/jni/ijksdl/ijksdl_inc_ffmpeg.h
+++ b/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
diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.c b/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
similarity index 98%
rename from ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.c
rename to ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c
index 2d997a03..41c0af34 100644
--- a/ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.c
+++ b/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;
diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.h b/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h
similarity index 88%
rename from ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.h
rename to ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h
index 49b6799c..e556eea7 100644
--- a/ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.h
+++ b/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
diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl.h b/ijkmediaplayer/jni/ijksdl/ijksdl.h
index 3f62ea6f..9deb2e74 100644
--- a/ijkmediaplayer/jni/ijksdl/ijksdl.h
+++ b/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
-- 
GitLab