diff --git a/ijkmediaplayer/jni/ffplay/Android.mk b/ijkmediaplayer/jni/ffplay/Android.mk new file mode 100644 index 0000000000000000000000000000000000000000..6e837fcde79bab6f0bf0a20851c39c1645e03f36 --- /dev/null +++ b/ijkmediaplayer/jni/ffplay/Android.mk @@ -0,0 +1,36 @@ +# +# Copyright (c) 2013 Zhang Rui +# +# 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) diff --git a/ijkmediaplayer/jni/ijkplayer/ff_cmdutils.c b/ijkmediaplayer/jni/ffplay/ff_cmdutils.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_cmdutils.c rename to ijkmediaplayer/jni/ffplay/ff_cmdutils.c diff --git a/ijkmediaplayer/jni/ijkplayer/ff_cmdutils.h b/ijkmediaplayer/jni/ffplay/ff_cmdutils.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_cmdutils.h rename to ijkmediaplayer/jni/ffplay/ff_cmdutils.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffinc.h b/ijkmediaplayer/jni/ffplay/ff_ffinc.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffinc.h rename to ijkmediaplayer/jni/ffplay/ff_ffinc.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffmsg_queue.h b/ijkmediaplayer/jni/ffplay/ff_ffmsg_queue.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffmsg_queue.h rename to ijkmediaplayer/jni/ffplay/ff_ffmsg_queue.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay.c b/ijkmediaplayer/jni/ffplay/ff_ffplay.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay.c rename to ijkmediaplayer/jni/ffplay/ff_ffplay.c diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay.h b/ijkmediaplayer/jni/ffplay/ff_ffplay.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay.h rename to ijkmediaplayer/jni/ffplay/ff_ffplay.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay_config.h b/ijkmediaplayer/jni/ffplay/ff_ffplay_config.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay_config.h rename to ijkmediaplayer/jni/ffplay/ff_ffplay_config.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h b/ijkmediaplayer/jni/ffplay/ff_ffplay_def.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h rename to ijkmediaplayer/jni/ffplay/ff_ffplay_def.h diff --git a/ijkmediaplayer/jni/ijkplayer/ijkerror.h b/ijkmediaplayer/jni/ffplay/ijkerror.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ijkerror.h rename to ijkmediaplayer/jni/ffplay/ijkerror.h diff --git a/ijkmediaplayer/jni/ijkplayer/Android.mk b/ijkmediaplayer/jni/ijkplayer_android/Android.mk similarity index 86% rename from ijkmediaplayer/jni/ijkplayer/Android.mk rename to ijkmediaplayer/jni/ijkplayer_android/Android.mk index c7cb28951ccec839d5b4407a95928f853c6a7641..c9a9080629d1a0ef73100b03f8449b0e75d16401 100644 --- a/ijkmediaplayer/jni/ijkplayer/Android.mk +++ b/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 diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c b/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.c similarity index 99% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c rename to ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.c index 9a907375f0bd0034fe2834d8c0e7428a3069eb49..4c0d07c39d6d1764206ef03dfa0b98d0f11246b4 100644 --- a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c +++ b/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.c @@ -23,8 +23,8 @@ #include "ijkplayer_android.h" #include -#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 { \ diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.h b/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.h rename to ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.h diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c b/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c similarity index 99% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c rename to ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c index 3c0922bc7c1d924872165eee563c01fef1e83a86..8324a11b73d982e002965677e926009e7fbc03fe 100644 --- a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c +++ b/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c @@ -24,9 +24,9 @@ #include #include #include -#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" diff --git a/ijkmediaplayer/jni/ijksdl/Android.mk b/ijkmediaplayer/jni/ijksdl/Android.mk index 6e125fad5d025074b862edb6fa0dccd0a6f50336..74de5899ac01128763be1480efa397fc6bce9552 100644 --- a/ijkmediaplayer/jni/ijksdl/Android.mk +++ b/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) diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl.h b/ijkmediaplayer/jni/ijksdl/ijksdl.h index 945de355a9f122fc54cdffd94503b9c6e0463220..3f62ea6f715d59ac91a09e0402daa4796a47e16e 100644 --- a/ijkmediaplayer/jni/ijksdl/ijksdl.h +++ b/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 diff --git a/ijkmediaplayer/jni/ijksdl_android/Android.mk b/ijkmediaplayer/jni/ijksdl_android/Android.mk new file mode 100644 index 0000000000000000000000000000000000000000..3f16947469ca794f93810b561f9607ce405c4bba --- /dev/null +++ b/ijkmediaplayer/jni/ijksdl_android/Android.mk @@ -0,0 +1,36 @@ +# copyright (c) 2013 Zhang Rui +# +# 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) diff --git a/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c b/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c rename to ijkmediaplayer/jni/ijksdl_android/android_audiotrack.c diff --git a/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h b/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h similarity index 98% rename from ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h rename to ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h index 0bbd295e8cf6186fd8003f0d444ac53555fa1b50..2d712deeb477f1d3abea6f3fb3f3cf891332180d 100644 --- a/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h +++ b/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h @@ -26,8 +26,8 @@ #include #include -#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 { diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h b/ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h new file mode 100644 index 0000000000000000000000000000000000000000..1e4a672a796f49089e4d56e61a11115e8c88d757 --- /dev/null +++ b/ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h @@ -0,0 +1,34 @@ +/***************************************************************************** + * ijksdl_android.h + ***************************************************************************** + * + * copyright (c) 2013 Zhang Rui + * + * 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 diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c b/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c similarity index 98% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c rename to ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c index 98f01d2a6f0634708f6fa5c76fa28c2809185e09..b0a2481b50f0f1c65f036e82c9090e406bd3d3af 100644 --- a/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c +++ b/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c @@ -26,8 +26,8 @@ #include #include #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 { diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h b/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h similarity index 97% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h rename to ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h index 9ed118ce34f98a681b8d5249f9eb353bcf441048..736960035583873a598baa9b08a4316d4bed27a8 100644 --- a/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h +++ b/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h @@ -25,7 +25,7 @@ #define IJKSDL__IJKSDL_AOUT_ANDROID_AUDIOTRACK_H #include -#include "../ijksdl_aout.h" +#include "ijksdl/ijksdl_aout.h" void SDL_Init_AoutAndroid(JNIEnv *env); SDL_Aout *SDL_AoutAndroid_CreateForAudioTrack(JavaVM* jvm); diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c b/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.c similarity index 98% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c rename to ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.c index 5a1d7fc053c27b5416438b34f69b723c8cec5b7f..6adb755379299cfb27420b39554885ac9afe313b 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 #include #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; diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h b/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.h similarity index 95% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h rename to ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.h index f33873292b64a0b57755d4995d86342c1caceb80..5757285f441e6778a5db396db68152ced2466fde 100644 --- a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h +++ b/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; diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c b/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c rename to ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.c diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h b/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h similarity index 95% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h rename to ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h index a7012a48a7e2fe011fbf55e97c1a9a468171f2b9..e46fa7486970d72bd10f5f5d98b63fe7837f6b3b 100644 --- a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h +++ b/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h @@ -25,8 +25,8 @@ #define IJKSDL__IJKSDL_VOUT_ANDROID_SURFACE_H #include -#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);