ijkplayer: make ffplay static lib

ijkmediaplayer/jni/ffplay/Android.mk

+#
+# Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+#
+# This file is part of ijkPlayer.
+#
+# ijkPlayer is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# ijkPlayer 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with ijkPlayer; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -std=c99
+LOCAL_LDLIBS += -llog -landroid
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)
+LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH)
+LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT)
+
+LOCAL_SRC_FILES += ff_cmdutils.c
+LOCAL_SRC_FILES += ff_ffplay.c
+
+LOCAL_STATIC_LIBRARIES := ijksdl
+
+LOCAL_MODULE := ffplay
+include $(BUILD_STATIC_LIBRARY)

ijkmediaplayer/jni/ijkplayer/Android.mk → ijkmediaplayer/jni/ijkplayer_android/Android.mk

@@ -27,12 +27,10 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)
 LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH)
 LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT)
 
-LOCAL_SRC_FILES += ff_cmdutils.c
-LOCAL_SRC_FILES += ff_ffplay.c
-LOCAL_SRC_FILES += android/ijkplayer.c
-LOCAL_SRC_FILES += android/ijkplayer_jni.c
+LOCAL_SRC_FILES += ijkplayer_jni.c
+LOCAL_SRC_FILES += ijkplayer_android.c
 
-LOCAL_STATIC_LIBRARIES := ijksdl
+LOCAL_STATIC_LIBRARIES := ijksdl ijksdl_android ffplay
 LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil
 
 LOCAL_MODULE := ijkplayer

ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c → ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.c

@@ -23,8 +23,8 @@
 #include "ijkplayer_android.h"
 
 #include <assert.h>
-#include "../ijkerror.h"
-#include "../ff_ffplay.h"
+#include "ffplay/ijkerror.h"
+#include "ffplay/ff_ffplay.h"
 
 #define MPST_CHECK_NOT_RET_INT(real, expected, errcode) \
     do { \

ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c → ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c

@@ -24,9 +24,9 @@
 #include <string.h>
 #include <pthread.h>
 #include <jni.h>
-#include "ijksdl/ijksdl.h"
+#include "ijksdl_android/ijksdl_android.h"
 #include "ijkutil/ijkutil.h"
-#include "../ijkerror.h"
+#include "ffplay/ijkerror.h"
 #include "ijkplayer_android.h"
 
 #define JNI_MODULE_PACKAGE      "tv/danmaku/ijk/media/player"

ijkmediaplayer/jni/ijksdl/Android.mk

@@ -35,13 +35,5 @@ LOCAL_SRC_FILES += ijksdl_timer.c
 LOCAL_SRC_FILES += ijksdl_vout.c
 LOCAL_SRC_FILES += ijksdl_vout_overlay_ffmpeg.c
 
-LOCAL_SRC_FILES += android/ijksdl_aout_android_audiotrack.c
-LOCAL_SRC_FILES += android/android_audiotrack.c
-
-LOCAL_SRC_FILES += android/ijksdl_vout_android_nativewindow.c
-LOCAL_SRC_FILES += android/ijksdl_vout_android_surface.c
-
-LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil
-
 LOCAL_MODULE := ijksdl
 include $(BUILD_STATIC_LIBRARY)

ijkmediaplayer/jni/ijksdl/ijksdl.h

@@ -34,9 +34,4 @@
 #include "ijksdl_vout.h"
 #include "ijksdl_vout_overlay_ffmpeg.h"
 
-#include "android/ijksdl_aout_android_audiotrack.h"
-
-#include "android/ijksdl_vout_android_nativewindow.h"
-#include "android/ijksdl_vout_android_surface.h"
-
 #endif

ijkmediaplayer/jni/ijksdl_android/Android.mk

+# copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+#
+# This file is part of ijkPlayer.
+#
+# ijkPlayer is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# ijkPlayer 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with ijkPlayer; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -std=c99
+LOCAL_LDLIBS += -llog -landroid
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)
+LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH)
+LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT)
+
+LOCAL_SRC_FILES += ijksdl_aout_android_audiotrack.c
+LOCAL_SRC_FILES += android_audiotrack.c
+
+LOCAL_SRC_FILES += ijksdl_vout_android_nativewindow.c
+LOCAL_SRC_FILES += ijksdl_vout_android_surface.c
+
+LOCAL_MODULE := ijksdl_android
+include $(BUILD_STATIC_LIBRARY)

ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h → ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h

@@ -26,8 +26,8 @@
 
 #include <stdint.h>
 #include <jni.h>
-#include "../ijksdl_audio.h"
-#include "../ijksdl_aout.h"
+#include "ijksdl/ijksdl_audio.h"
+#include "ijksdl/ijksdl_aout.h"
 
 typedef struct SDL_AndroidAudioTrack_Spec {
     enum StreamType {

ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h

+/*****************************************************************************
+ * ijksdl_android.h
+ *****************************************************************************
+ *
+ * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ *
+ * This file is part of ijkPlayer.
+ *
+ * ijkPlayer is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * ijkPlayer 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with ijkPlayer; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef IJKSDL__IJKSDL_ANDROID_H
+#define IJKSDL__IJKSDL_ANDROID_H
+
+#include "ijksdl/ijksdl.h"
+
+#include "ijksdl_aout_android_audiotrack.h"
+
+#include "ijksdl_vout_android_nativewindow.h"
+#include "ijksdl_vout_android_surface.h"
+
+#endif

ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c → ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c

@@ -26,8 +26,8 @@
 #include <stdbool.h>
 #include <assert.h>
 #include "ijkutil/ijkutil.h"
-#include "../ijksdl_thread.h"
-#include "../ijksdl_aout_internal.h"
+#include "ijksdl/ijksdl_thread.h"
+#include "ijksdl/ijksdl_aout_internal.h"
 #include "android_audiotrack.h"
 
 typedef struct SDL_Aout_Opaque {

ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h → ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h

@@ -25,7 +25,7 @@
 #define IJKSDL__IJKSDL_AOUT_ANDROID_AUDIOTRACK_H
 
 #include <jni.h>
-#include "../ijksdl_aout.h"
+#include "ijksdl/ijksdl_aout.h"
 
 void SDL_Init_AoutAndroid(JNIEnv *env);
 SDL_Aout *SDL_AoutAndroid_CreateForAudioTrack(JavaVM* jvm);

ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c → 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_ffinc.h"
-#include "../ijksdl_vout.h"
-#include "../ijksdl_vout_internal.h"
+#include "ijksdl/ijksdl_ffinc.h"
+#include "ijksdl/ijksdl_vout.h"
+#include "ijksdl/ijksdl_vout_internal.h"
 
 typedef struct SDL_VoutSurface_Opaque {
     SDL_Vout *vout;

ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h → ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.h

@@ -24,8 +24,8 @@
 #ifndef IJKSDL__IJKSDL_VOUT_ANDROID_NATIVEWINDOW_H
 #define IJKSDL__IJKSDL_VOUT_ANDROID_NATIVEWINDOW_H
 
-#include "../ijksdl_stdinc.h"
-#include "../ijksdl_vout.h"
+#include "ijksdl/ijksdl_stdinc.h"
+#include "ijksdl/ijksdl_vout.h"
 
 typedef struct ANativeWindow ANativeWindow;
 

ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h → ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h

@@ -25,8 +25,8 @@
 #define IJKSDL__IJKSDL_VOUT_ANDROID_SURFACE_H
 
 #include <jni.h>
-#include "../ijksdl_stdinc.h"
-#include "../ijksdl_vout.h"
+#include "ijksdl/ijksdl_stdinc.h"
+#include "ijksdl/ijksdl_vout.h"
 
 SDL_Vout *SDL_VoutAndroid_CreateForAndroidSurface();
 void SDL_VoutAndroid_SetAndroidSurface(SDL_Vout *vout, JNIEnv *env, jobject android_surface);