From c5dc0164be5e8cc6637d69ad4eaff46d5d48715b Mon Sep 17 00:00:00 2001 From: bbcallen Date: Mon, 12 Aug 2013 19:42:55 +0800 Subject: [PATCH] ijkmedia: move to commit folder for share --- .../compile-ffmpeg.sh | 0 compile-ijk.sh => android/compile-ijk.sh | 0 .../ijkmediademo}/.classpath | 2 +- .../ijkmediademo}/.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../ijkmediademo}/AndroidManifest.xml | 0 .../ijkmediademo}/proguard-project.txt | 0 .../ijkmediademo}/project.properties | 0 .../res/drawable-hdpi/ic_launcher.png | Bin .../res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_launcher.png | Bin .../res/layout/activity_player.xml | 0 .../ijkmediademo}/res/values/attrs.xml | 0 .../ijkmediademo}/res/values/colors.xml | 0 .../ijkmediademo}/res/values/strings.xml | 0 .../ijkmediademo}/res/values/styles.xml | 0 .../ijk/media/demo/VideoPlayerActivity.java | 0 .../ijkmediaplayer}/.classpath | 4 ++-- .../ijkmediaplayer}/.cproject | 0 .../ijkmediaplayer}/.project | 0 .../org.eclipse.cdt.codan.core.prefs | 0 .../.settings/org.eclipse.cdt.core.prefs | 0 .../.settings/org.eclipse.cdt.ui.prefs | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../ijkmediaplayer}/AndroidManifest.xml | 0 .../ijkmediaplayer}/jni/Android.mk | 5 ++--- .../ijkmediaplayer}/jni/Application.mk | 0 .../ijkmediaplayer}/jni/ffmpeg/Android.mk | 0 .../ijkmediaplayer}/jni/ffmpeg/include | 0 android/ijkmediaplayer/jni/ijkmedia | 1 + .../ijkmediaplayer}/proguard-project.txt | 0 .../ijkmediaplayer}/project.properties | 0 .../ijk/media/player/AbstractMediaPlayer.java | 0 .../ijk/media/player/AndroidMediaPlayer.java | 0 .../tv/danmaku/ijk/media/player/DebugLog.java | 0 .../ijk/media/player/IjkMediaException.java | 0 .../ijk/media/player/IjkMediaPlayer.java | 0 .../tv/danmaku/ijk/media/player/Pragma.java | 0 .../player/annotations/AccessedByNative.java | 0 .../player/annotations/CalledByNative.java | 0 .../ijkmediawidget}/.classpath | 0 .../ijkmediawidget}/.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../ijkmediawidget}/AndroidManifest.xml | 0 .../ijkmediawidget}/proguard-project.txt | 0 .../ijkmediawidget}/project.properties | 0 .../res/drawable-hdpi/ic_launcher.png | Bin .../res/drawable-hdpi/mediacontroller_bg.png | Bin .../drawable-hdpi/mediacontroller_pause01.png | Bin .../drawable-hdpi/mediacontroller_pause02.png | Bin .../drawable-hdpi/mediacontroller_play01.png | Bin .../drawable-hdpi/mediacontroller_play02.png | Bin .../mediacontroller_seekbar01.png | Bin .../mediacontroller_seekbar02.png | Bin .../res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_launcher.png | Bin .../scrubber_control_disabled_holo.png | Bin .../scrubber_control_focused_holo.png | Bin .../scrubber_control_normal_holo.png | Bin .../scrubber_control_pressed_holo.png | Bin .../scrubber_primary_holo.9.png | Bin .../scrubber_secondary_holo.9.png | Bin .../scrubber_track_holo_dark.9.png | Bin .../drawable/mediacontroller_pause_button.xml | 0 .../drawable/mediacontroller_play_button.xml | 0 .../scrubber_control_selector_holo.xml | 0 ...scrubber_progress_horizontal_holo_dark.xml | 0 .../res/layout/mediacontroller.xml | 0 .../ijkmediawidget}/res/values-v11/styles.xml | 0 .../ijkmediawidget}/res/values-v14/styles.xml | 0 .../ijkmediawidget}/res/values/strings.xml | 0 .../ijkmediawidget}/res/values/styles.xml | 0 .../ijk/media/widget/CenterLayout.java | 0 .../tv/danmaku/ijk/media/widget/DebugLog.java | 0 .../ijk/media/widget/MediaController.java | 0 .../ijk/media/widget/OutlineTextView.java | 0 .../tv/danmaku/ijk/media/widget/Pragma.java | 0 .../danmaku/ijk/media/widget/VideoView.java | 0 .../ndk-stack-ijkmp.sh | 0 {tools => android}/setup-as-commiter.sh | 0 ijkmedia/Android.mk | 20 ++++++++++++++++++ ijkmedia/ijkmedia | 1 + .../jni => ijkmedia}/ijkplayer/Android.mk | 3 +-- .../ijkplayer/android/ijkplayer_android.c | 0 .../ijkplayer/android/ijkplayer_android.h | 0 .../ijkplayer/android/ijkplayer_android_def.h | 0 .../ijkplayer/android/ijkplayer_jni.c | 0 .../jni => ijkmedia}/ijkplayer/ff_cmdutils.c | 0 .../jni => ijkmedia}/ijkplayer/ff_cmdutils.h | 0 .../jni => ijkmedia}/ijkplayer/ff_fferror.h | 0 .../jni => ijkmedia}/ijkplayer/ff_ffinc.h | 0 .../jni => ijkmedia}/ijkplayer/ff_ffmsg.h | 0 .../ijkplayer/ff_ffmsg_queue.h | 0 .../jni => ijkmedia}/ijkplayer/ff_ffplay.c | 0 .../jni => ijkmedia}/ijkplayer/ff_ffplay.h | 0 .../ijkplayer/ff_ffplay_config.h | 0 .../ijkplayer/ff_ffplay_def.h | 0 .../jni => ijkmedia}/ijksdl/Android.mk | 2 +- .../ijksdl/android/android_audiotrack.c | 0 .../ijksdl/android/android_audiotrack.h | 0 .../ijksdl/android/android_nativewindow.c | 0 .../ijksdl/android/android_nativewindow.h | 0 .../ijksdl/android/ijksdl_android_jni.c | 0 .../ijksdl/android/ijksdl_android_jni.h | 0 .../android/ijksdl_aout_android_audiotrack.c | 0 .../android/ijksdl_aout_android_audiotrack.h | 0 .../android/ijksdl_inc_internal_android.h | 0 .../ijksdl_vout_android_nativewindow.c | 0 .../ijksdl_vout_android_nativewindow.h | 0 .../android/ijksdl_vout_android_surface.c | 0 .../android/ijksdl_vout_android_surface.h | 0 .../ijksdl/ffmpeg/abi_all/image_convert.c | 0 .../ffmpeg/abi_armv7a_neon/chroma_neon.h | 0 .../ijksdl/ffmpeg/abi_armv7a_neon/i420_rgb.S | 0 .../ijksdl/ffmpeg/abi_armv7a_neon/i420_rv16.S | 0 .../ffmpeg/abi_armv7a_neon/image_convert.c | 0 .../ijksdl/ffmpeg/abi_armv7a_neon/nv12_rgb.S | 0 .../ijksdl/ffmpeg/abi_armv7a_neon/nv21_rgb.S | 0 .../ijksdl/ffmpeg/ijksdl_image_convert.h | 0 .../ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h | 0 .../ffmpeg/ijksdl_vout_overlay_ffmpeg.c | 0 .../ffmpeg/ijksdl_vout_overlay_ffmpeg.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_android.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_aout.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_aout.h | 0 .../ijksdl/ijksdl_aout_internal.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_audio.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_endian.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_error.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_error.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_fourcc.h | 0 .../ijksdl/ijksdl_inc_internal.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_mutex.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_mutex.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_stdinc.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_stdinc.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_thread.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_thread.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_timer.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_timer.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_video.h | 0 .../jni => ijkmedia}/ijksdl/ijksdl_vout.c | 0 .../jni => ijkmedia}/ijksdl/ijksdl_vout.h | 0 .../ijksdl/ijksdl_vout_internal.h | 0 .../jni => ijkmedia}/ijkutil/Android.mk | 0 .../ijkutil/android/jnihelp.cpp | 0 .../ijkutil/android/jnihelp.h | 0 .../jni => ijkmedia}/ijkutil/ijkutil.h | 0 .../ijkutil/ijkutil_android.h | 0 .../jni => ijkmedia}/ijkutil/loghelp.c | 0 .../jni => ijkmedia}/ijkutil/loghelp.h | 0 155 files changed, 29 insertions(+), 9 deletions(-) rename compile-ffmpeg.sh => android/compile-ffmpeg.sh (100%) rename compile-ijk.sh => android/compile-ijk.sh (100%) rename {ijkmediademo => android/ijkmediademo}/.classpath (100%) rename {ijkmediademo => android/ijkmediademo}/.project (100%) rename {ijkmediademo => android/ijkmediademo}/.settings/org.eclipse.core.resources.prefs (100%) rename {ijkmediademo => android/ijkmediademo}/.settings/org.eclipse.core.runtime.prefs (100%) rename {ijkmediademo => android/ijkmediademo}/AndroidManifest.xml (100%) rename {ijkmediademo => android/ijkmediademo}/proguard-project.txt (100%) rename {ijkmediademo => android/ijkmediademo}/project.properties (100%) rename {ijkmediademo => android/ijkmediademo}/res/drawable-hdpi/ic_launcher.png (100%) rename {ijkmediademo => android/ijkmediademo}/res/drawable-mdpi/ic_launcher.png (100%) rename {ijkmediademo => android/ijkmediademo}/res/drawable-xhdpi/ic_launcher.png (100%) rename {ijkmediademo => android/ijkmediademo}/res/layout/activity_player.xml (100%) rename {ijkmediademo => android/ijkmediademo}/res/values/attrs.xml (100%) rename {ijkmediademo => android/ijkmediademo}/res/values/colors.xml (100%) rename {ijkmediademo => android/ijkmediademo}/res/values/strings.xml (100%) rename {ijkmediademo => android/ijkmediademo}/res/values/styles.xml (100%) rename {ijkmediademo => android/ijkmediademo}/src/tv/danmaku/ijk/media/demo/VideoPlayerActivity.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.classpath (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.cproject (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.project (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.settings/org.eclipse.cdt.codan.core.prefs (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.settings/org.eclipse.cdt.core.prefs (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.settings/org.eclipse.cdt.ui.prefs (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.settings/org.eclipse.core.resources.prefs (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/.settings/org.eclipse.core.runtime.prefs (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/AndroidManifest.xml (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/jni/Android.mk (82%) rename {ijkmediaplayer => android/ijkmediaplayer}/jni/Application.mk (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/jni/ffmpeg/Android.mk (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/jni/ffmpeg/include (100%) create mode 120000 android/ijkmediaplayer/jni/ijkmedia rename {ijkmediaplayer => android/ijkmediaplayer}/proguard-project.txt (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/project.properties (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/DebugLog.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/IjkMediaException.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/Pragma.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java (100%) rename {ijkmediaplayer => android/ijkmediaplayer}/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java (100%) rename {ijkmediawidget => android/ijkmediawidget}/.classpath (100%) rename {ijkmediawidget => android/ijkmediawidget}/.project (100%) rename {ijkmediawidget => android/ijkmediawidget}/.settings/org.eclipse.core.resources.prefs (100%) rename {ijkmediawidget => android/ijkmediawidget}/.settings/org.eclipse.core.runtime.prefs (100%) rename {ijkmediawidget => android/ijkmediawidget}/AndroidManifest.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/proguard-project.txt (100%) rename {ijkmediawidget => android/ijkmediawidget}/project.properties (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/ic_launcher.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_bg.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_pause01.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_pause02.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_play01.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_play02.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_seekbar01.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-hdpi/mediacontroller_seekbar02.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-mdpi/ic_launcher.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/ic_launcher.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_control_disabled_holo.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_control_focused_holo.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_control_normal_holo.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_control_pressed_holo.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_primary_holo.9.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_secondary_holo.9.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable-xhdpi/scrubber_track_holo_dark.9.png (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable/mediacontroller_pause_button.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable/mediacontroller_play_button.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable/scrubber_control_selector_holo.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/drawable/scrubber_progress_horizontal_holo_dark.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/layout/mediacontroller.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/values-v11/styles.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/values-v14/styles.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/values/strings.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/res/values/styles.xml (100%) rename {ijkmediawidget => android/ijkmediawidget}/src/tv/danmaku/ijk/media/widget/CenterLayout.java (100%) rename {ijkmediawidget => android/ijkmediawidget}/src/tv/danmaku/ijk/media/widget/DebugLog.java (100%) rename {ijkmediawidget => android/ijkmediawidget}/src/tv/danmaku/ijk/media/widget/MediaController.java (100%) rename {ijkmediawidget => android/ijkmediawidget}/src/tv/danmaku/ijk/media/widget/OutlineTextView.java (100%) rename {ijkmediawidget => android/ijkmediawidget}/src/tv/danmaku/ijk/media/widget/Pragma.java (100%) rename {ijkmediawidget => android/ijkmediawidget}/src/tv/danmaku/ijk/media/widget/VideoView.java (100%) rename ndk-stack-ijkmp.sh => android/ndk-stack-ijkmp.sh (100%) rename {tools => android}/setup-as-commiter.sh (100%) create mode 100644 ijkmedia/Android.mk create mode 120000 ijkmedia/ijkmedia rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/Android.mk (93%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/android/ijkplayer_android.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/android/ijkplayer_android.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/android/ijkplayer_android_def.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/android/ijkplayer_jni.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_cmdutils.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_cmdutils.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_fferror.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffinc.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffmsg.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffmsg_queue.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffplay.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffplay.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffplay_config.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkplayer/ff_ffplay_def.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/Android.mk (97%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/android_audiotrack.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/android_audiotrack.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/android_nativewindow.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/android_nativewindow.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_android_jni.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_android_jni.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_aout_android_audiotrack.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_aout_android_audiotrack.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_inc_internal_android.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_vout_android_nativewindow.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_vout_android_nativewindow.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_vout_android_surface.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/android/ijksdl_vout_android_surface.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_all/image_convert.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_armv7a_neon/chroma_neon.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_armv7a_neon/i420_rgb.S (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_armv7a_neon/i420_rv16.S (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_armv7a_neon/nv12_rgb.S (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/abi_armv7a_neon/nv21_rgb.S (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/ijksdl_image_convert.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_android.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_aout.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_aout.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_aout_internal.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_audio.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_endian.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_error.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_error.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_fourcc.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_inc_internal.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_mutex.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_mutex.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_stdinc.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_stdinc.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_thread.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_thread.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_timer.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_timer.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_video.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_vout.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_vout.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijksdl/ijksdl_vout_internal.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/Android.mk (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/android/jnihelp.cpp (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/android/jnihelp.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/ijkutil.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/ijkutil_android.h (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/loghelp.c (100%) rename {ijkmediaplayer/jni => ijkmedia}/ijkutil/loghelp.h (100%) diff --git a/compile-ffmpeg.sh b/android/compile-ffmpeg.sh similarity index 100% rename from compile-ffmpeg.sh rename to android/compile-ffmpeg.sh diff --git a/compile-ijk.sh b/android/compile-ijk.sh similarity index 100% rename from compile-ijk.sh rename to android/compile-ijk.sh diff --git a/ijkmediademo/.classpath b/android/ijkmediademo/.classpath similarity index 100% rename from ijkmediademo/.classpath rename to android/ijkmediademo/.classpath index dd1cb502..93fdaf7f 100644 --- a/ijkmediademo/.classpath +++ b/android/ijkmediademo/.classpath @@ -1,11 +1,11 @@ - + diff --git a/ijkmediademo/.project b/android/ijkmediademo/.project similarity index 100% rename from ijkmediademo/.project rename to android/ijkmediademo/.project diff --git a/ijkmediademo/.settings/org.eclipse.core.resources.prefs b/android/ijkmediademo/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from ijkmediademo/.settings/org.eclipse.core.resources.prefs rename to android/ijkmediademo/.settings/org.eclipse.core.resources.prefs diff --git a/ijkmediademo/.settings/org.eclipse.core.runtime.prefs b/android/ijkmediademo/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from ijkmediademo/.settings/org.eclipse.core.runtime.prefs rename to android/ijkmediademo/.settings/org.eclipse.core.runtime.prefs diff --git a/ijkmediademo/AndroidManifest.xml b/android/ijkmediademo/AndroidManifest.xml similarity index 100% rename from ijkmediademo/AndroidManifest.xml rename to android/ijkmediademo/AndroidManifest.xml diff --git a/ijkmediademo/proguard-project.txt b/android/ijkmediademo/proguard-project.txt similarity index 100% rename from ijkmediademo/proguard-project.txt rename to android/ijkmediademo/proguard-project.txt diff --git a/ijkmediademo/project.properties b/android/ijkmediademo/project.properties similarity index 100% rename from ijkmediademo/project.properties rename to android/ijkmediademo/project.properties diff --git a/ijkmediademo/res/drawable-hdpi/ic_launcher.png b/android/ijkmediademo/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from ijkmediademo/res/drawable-hdpi/ic_launcher.png rename to android/ijkmediademo/res/drawable-hdpi/ic_launcher.png diff --git a/ijkmediademo/res/drawable-mdpi/ic_launcher.png b/android/ijkmediademo/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from ijkmediademo/res/drawable-mdpi/ic_launcher.png rename to android/ijkmediademo/res/drawable-mdpi/ic_launcher.png diff --git a/ijkmediademo/res/drawable-xhdpi/ic_launcher.png b/android/ijkmediademo/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from ijkmediademo/res/drawable-xhdpi/ic_launcher.png rename to android/ijkmediademo/res/drawable-xhdpi/ic_launcher.png diff --git a/ijkmediademo/res/layout/activity_player.xml b/android/ijkmediademo/res/layout/activity_player.xml similarity index 100% rename from ijkmediademo/res/layout/activity_player.xml rename to android/ijkmediademo/res/layout/activity_player.xml diff --git a/ijkmediademo/res/values/attrs.xml b/android/ijkmediademo/res/values/attrs.xml similarity index 100% rename from ijkmediademo/res/values/attrs.xml rename to android/ijkmediademo/res/values/attrs.xml diff --git a/ijkmediademo/res/values/colors.xml b/android/ijkmediademo/res/values/colors.xml similarity index 100% rename from ijkmediademo/res/values/colors.xml rename to android/ijkmediademo/res/values/colors.xml diff --git a/ijkmediademo/res/values/strings.xml b/android/ijkmediademo/res/values/strings.xml similarity index 100% rename from ijkmediademo/res/values/strings.xml rename to android/ijkmediademo/res/values/strings.xml diff --git a/ijkmediademo/res/values/styles.xml b/android/ijkmediademo/res/values/styles.xml similarity index 100% rename from ijkmediademo/res/values/styles.xml rename to android/ijkmediademo/res/values/styles.xml diff --git a/ijkmediademo/src/tv/danmaku/ijk/media/demo/VideoPlayerActivity.java b/android/ijkmediademo/src/tv/danmaku/ijk/media/demo/VideoPlayerActivity.java similarity index 100% rename from ijkmediademo/src/tv/danmaku/ijk/media/demo/VideoPlayerActivity.java rename to android/ijkmediademo/src/tv/danmaku/ijk/media/demo/VideoPlayerActivity.java diff --git a/ijkmediaplayer/.classpath b/android/ijkmediaplayer/.classpath similarity index 100% rename from ijkmediaplayer/.classpath rename to android/ijkmediaplayer/.classpath index 7bc01d9a..51769745 100644 --- a/ijkmediaplayer/.classpath +++ b/android/ijkmediaplayer/.classpath @@ -1,9 +1,9 @@ - - + + diff --git a/ijkmediaplayer/.cproject b/android/ijkmediaplayer/.cproject similarity index 100% rename from ijkmediaplayer/.cproject rename to android/ijkmediaplayer/.cproject diff --git a/ijkmediaplayer/.project b/android/ijkmediaplayer/.project similarity index 100% rename from ijkmediaplayer/.project rename to android/ijkmediaplayer/.project diff --git a/ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs b/android/ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs rename to android/ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs b/android/ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs similarity index 100% rename from ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs rename to android/ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs diff --git a/ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs b/android/ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs similarity index 100% rename from ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs rename to android/ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs diff --git a/ijkmediaplayer/.settings/org.eclipse.core.resources.prefs b/android/ijkmediaplayer/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from ijkmediaplayer/.settings/org.eclipse.core.resources.prefs rename to android/ijkmediaplayer/.settings/org.eclipse.core.resources.prefs diff --git a/ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs b/android/ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs rename to android/ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs diff --git a/ijkmediaplayer/AndroidManifest.xml b/android/ijkmediaplayer/AndroidManifest.xml similarity index 100% rename from ijkmediaplayer/AndroidManifest.xml rename to android/ijkmediaplayer/AndroidManifest.xml diff --git a/ijkmediaplayer/jni/Android.mk b/android/ijkmediaplayer/jni/Android.mk similarity index 82% rename from ijkmediaplayer/jni/Android.mk rename to android/ijkmediaplayer/jni/Android.mk index 0fa71ba1..5b08acf4 100644 --- a/ijkmediaplayer/jni/Android.mk +++ b/android/ijkmediaplayer/jni/Android.mk @@ -20,11 +20,10 @@ LOCAL_PATH := $(call my-dir) MY_APP_JNI_ROOT := $(realpath $(LOCAL_PATH)) MY_APP_PRJ_ROOT := $(realpath $(MY_APP_JNI_ROOT)/..) -MY_APP_REPO_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/..) +MY_APP_ANDROID_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/..) # armeabi-v7a -MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_REPO_ROOT)/build/ffmpeg-armv7a/output) +MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/build/ffmpeg-armv7a/output) MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include) -MY_APP_FFMPEG_INCLUDE_PATH_ALTER := $(realpath $(MY_APP_REPO_ROOT)/ffmpeg/include) include $(call all-subdir-makefiles) diff --git a/ijkmediaplayer/jni/Application.mk b/android/ijkmediaplayer/jni/Application.mk similarity index 100% rename from ijkmediaplayer/jni/Application.mk rename to android/ijkmediaplayer/jni/Application.mk diff --git a/ijkmediaplayer/jni/ffmpeg/Android.mk b/android/ijkmediaplayer/jni/ffmpeg/Android.mk similarity index 100% rename from ijkmediaplayer/jni/ffmpeg/Android.mk rename to android/ijkmediaplayer/jni/ffmpeg/Android.mk diff --git a/ijkmediaplayer/jni/ffmpeg/include b/android/ijkmediaplayer/jni/ffmpeg/include similarity index 100% rename from ijkmediaplayer/jni/ffmpeg/include rename to android/ijkmediaplayer/jni/ffmpeg/include diff --git a/android/ijkmediaplayer/jni/ijkmedia b/android/ijkmediaplayer/jni/ijkmedia new file mode 120000 index 00000000..5bb840c5 --- /dev/null +++ b/android/ijkmediaplayer/jni/ijkmedia @@ -0,0 +1 @@ +../../../ijkmedia \ No newline at end of file diff --git a/ijkmediaplayer/proguard-project.txt b/android/ijkmediaplayer/proguard-project.txt similarity index 100% rename from ijkmediaplayer/proguard-project.txt rename to android/ijkmediaplayer/proguard-project.txt diff --git a/ijkmediaplayer/project.properties b/android/ijkmediaplayer/project.properties similarity index 100% rename from ijkmediaplayer/project.properties rename to android/ijkmediaplayer/project.properties diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/DebugLog.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/DebugLog.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/DebugLog.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/DebugLog.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaException.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaException.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaException.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaException.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/Pragma.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/Pragma.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/Pragma.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/Pragma.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java diff --git a/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java similarity index 100% rename from ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java rename to android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java diff --git a/ijkmediawidget/.classpath b/android/ijkmediawidget/.classpath similarity index 100% rename from ijkmediawidget/.classpath rename to android/ijkmediawidget/.classpath diff --git a/ijkmediawidget/.project b/android/ijkmediawidget/.project similarity index 100% rename from ijkmediawidget/.project rename to android/ijkmediawidget/.project diff --git a/ijkmediawidget/.settings/org.eclipse.core.resources.prefs b/android/ijkmediawidget/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from ijkmediawidget/.settings/org.eclipse.core.resources.prefs rename to android/ijkmediawidget/.settings/org.eclipse.core.resources.prefs diff --git a/ijkmediawidget/.settings/org.eclipse.core.runtime.prefs b/android/ijkmediawidget/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from ijkmediawidget/.settings/org.eclipse.core.runtime.prefs rename to android/ijkmediawidget/.settings/org.eclipse.core.runtime.prefs diff --git a/ijkmediawidget/AndroidManifest.xml b/android/ijkmediawidget/AndroidManifest.xml similarity index 100% rename from ijkmediawidget/AndroidManifest.xml rename to android/ijkmediawidget/AndroidManifest.xml diff --git a/ijkmediawidget/proguard-project.txt b/android/ijkmediawidget/proguard-project.txt similarity index 100% rename from ijkmediawidget/proguard-project.txt rename to android/ijkmediawidget/proguard-project.txt diff --git a/ijkmediawidget/project.properties b/android/ijkmediawidget/project.properties similarity index 100% rename from ijkmediawidget/project.properties rename to android/ijkmediawidget/project.properties diff --git a/ijkmediawidget/res/drawable-hdpi/ic_launcher.png b/android/ijkmediawidget/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/ic_launcher.png rename to android/ijkmediawidget/res/drawable-hdpi/ic_launcher.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_bg.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_bg.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_bg.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_bg.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause01.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause01.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_pause01.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause01.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause02.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause02.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_pause02.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause02.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_play01.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play01.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_play01.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play01.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_play02.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play02.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_play02.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play02.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar01.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar01.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar01.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar01.png diff --git a/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar02.png b/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar02.png similarity index 100% rename from ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar02.png rename to android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar02.png diff --git a/ijkmediawidget/res/drawable-mdpi/ic_launcher.png b/android/ijkmediawidget/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from ijkmediawidget/res/drawable-mdpi/ic_launcher.png rename to android/ijkmediawidget/res/drawable-mdpi/ic_launcher.png diff --git a/ijkmediawidget/res/drawable-xhdpi/ic_launcher.png b/android/ijkmediawidget/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/ic_launcher.png rename to android/ijkmediawidget/res/drawable-xhdpi/ic_launcher.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_control_disabled_holo.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_disabled_holo.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_control_disabled_holo.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_disabled_holo.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_control_focused_holo.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_focused_holo.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_control_focused_holo.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_focused_holo.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_control_normal_holo.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_normal_holo.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_control_normal_holo.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_normal_holo.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_control_pressed_holo.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_pressed_holo.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_control_pressed_holo.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_pressed_holo.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_primary_holo.9.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_primary_holo.9.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_primary_holo.9.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_primary_holo.9.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_secondary_holo.9.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_secondary_holo.9.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_secondary_holo.9.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_secondary_holo.9.png diff --git a/ijkmediawidget/res/drawable-xhdpi/scrubber_track_holo_dark.9.png b/android/ijkmediawidget/res/drawable-xhdpi/scrubber_track_holo_dark.9.png similarity index 100% rename from ijkmediawidget/res/drawable-xhdpi/scrubber_track_holo_dark.9.png rename to android/ijkmediawidget/res/drawable-xhdpi/scrubber_track_holo_dark.9.png diff --git a/ijkmediawidget/res/drawable/mediacontroller_pause_button.xml b/android/ijkmediawidget/res/drawable/mediacontroller_pause_button.xml similarity index 100% rename from ijkmediawidget/res/drawable/mediacontroller_pause_button.xml rename to android/ijkmediawidget/res/drawable/mediacontroller_pause_button.xml diff --git a/ijkmediawidget/res/drawable/mediacontroller_play_button.xml b/android/ijkmediawidget/res/drawable/mediacontroller_play_button.xml similarity index 100% rename from ijkmediawidget/res/drawable/mediacontroller_play_button.xml rename to android/ijkmediawidget/res/drawable/mediacontroller_play_button.xml diff --git a/ijkmediawidget/res/drawable/scrubber_control_selector_holo.xml b/android/ijkmediawidget/res/drawable/scrubber_control_selector_holo.xml similarity index 100% rename from ijkmediawidget/res/drawable/scrubber_control_selector_holo.xml rename to android/ijkmediawidget/res/drawable/scrubber_control_selector_holo.xml diff --git a/ijkmediawidget/res/drawable/scrubber_progress_horizontal_holo_dark.xml b/android/ijkmediawidget/res/drawable/scrubber_progress_horizontal_holo_dark.xml similarity index 100% rename from ijkmediawidget/res/drawable/scrubber_progress_horizontal_holo_dark.xml rename to android/ijkmediawidget/res/drawable/scrubber_progress_horizontal_holo_dark.xml diff --git a/ijkmediawidget/res/layout/mediacontroller.xml b/android/ijkmediawidget/res/layout/mediacontroller.xml similarity index 100% rename from ijkmediawidget/res/layout/mediacontroller.xml rename to android/ijkmediawidget/res/layout/mediacontroller.xml diff --git a/ijkmediawidget/res/values-v11/styles.xml b/android/ijkmediawidget/res/values-v11/styles.xml similarity index 100% rename from ijkmediawidget/res/values-v11/styles.xml rename to android/ijkmediawidget/res/values-v11/styles.xml diff --git a/ijkmediawidget/res/values-v14/styles.xml b/android/ijkmediawidget/res/values-v14/styles.xml similarity index 100% rename from ijkmediawidget/res/values-v14/styles.xml rename to android/ijkmediawidget/res/values-v14/styles.xml diff --git a/ijkmediawidget/res/values/strings.xml b/android/ijkmediawidget/res/values/strings.xml similarity index 100% rename from ijkmediawidget/res/values/strings.xml rename to android/ijkmediawidget/res/values/strings.xml diff --git a/ijkmediawidget/res/values/styles.xml b/android/ijkmediawidget/res/values/styles.xml similarity index 100% rename from ijkmediawidget/res/values/styles.xml rename to android/ijkmediawidget/res/values/styles.xml diff --git a/ijkmediawidget/src/tv/danmaku/ijk/media/widget/CenterLayout.java b/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/CenterLayout.java similarity index 100% rename from ijkmediawidget/src/tv/danmaku/ijk/media/widget/CenterLayout.java rename to android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/CenterLayout.java diff --git a/ijkmediawidget/src/tv/danmaku/ijk/media/widget/DebugLog.java b/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/DebugLog.java similarity index 100% rename from ijkmediawidget/src/tv/danmaku/ijk/media/widget/DebugLog.java rename to android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/DebugLog.java diff --git a/ijkmediawidget/src/tv/danmaku/ijk/media/widget/MediaController.java b/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/MediaController.java similarity index 100% rename from ijkmediawidget/src/tv/danmaku/ijk/media/widget/MediaController.java rename to android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/MediaController.java diff --git a/ijkmediawidget/src/tv/danmaku/ijk/media/widget/OutlineTextView.java b/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/OutlineTextView.java similarity index 100% rename from ijkmediawidget/src/tv/danmaku/ijk/media/widget/OutlineTextView.java rename to android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/OutlineTextView.java diff --git a/ijkmediawidget/src/tv/danmaku/ijk/media/widget/Pragma.java b/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/Pragma.java similarity index 100% rename from ijkmediawidget/src/tv/danmaku/ijk/media/widget/Pragma.java rename to android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/Pragma.java diff --git a/ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java b/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java similarity index 100% rename from ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java rename to android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java diff --git a/ndk-stack-ijkmp.sh b/android/ndk-stack-ijkmp.sh similarity index 100% rename from ndk-stack-ijkmp.sh rename to android/ndk-stack-ijkmp.sh diff --git a/tools/setup-as-commiter.sh b/android/setup-as-commiter.sh similarity index 100% rename from tools/setup-as-commiter.sh rename to android/setup-as-commiter.sh diff --git a/ijkmedia/Android.mk b/ijkmedia/Android.mk new file mode 100644 index 00000000..6fdf95e7 --- /dev/null +++ b/ijkmedia/Android.mk @@ -0,0 +1,20 @@ +# 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 $(call all-subdir-makefiles) diff --git a/ijkmedia/ijkmedia b/ijkmedia/ijkmedia new file mode 120000 index 00000000..25729004 --- /dev/null +++ b/ijkmedia/ijkmedia @@ -0,0 +1 @@ +ijkmedia \ No newline at end of file diff --git a/ijkmediaplayer/jni/ijkplayer/Android.mk b/ijkmedia/ijkplayer/Android.mk similarity index 93% rename from ijkmediaplayer/jni/ijkplayer/Android.mk rename to ijkmedia/ijkplayer/Android.mk index e0dfc216..0ccfc982 100644 --- a/ijkmediaplayer/jni/ijkplayer/Android.mk +++ b/ijkmedia/ijkplayer/Android.mk @@ -24,9 +24,8 @@ LOCAL_CFLAGS += -std=c99 LOCAL_LDLIBS += -llog -landroid LOCAL_C_INCLUDES += $(LOCAL_PATH) +LOCAL_C_INCLUDES += $(realpath $(LOCAL_PATH)/..) LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH) -LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH_ALTER) -LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) LOCAL_SRC_FILES += ff_cmdutils.c LOCAL_SRC_FILES += ff_ffplay.c diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c b/ijkmedia/ijkplayer/android/ijkplayer_android.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c rename to ijkmedia/ijkplayer/android/ijkplayer_android.c diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.h b/ijkmedia/ijkplayer/android/ijkplayer_android.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.h rename to ijkmedia/ijkplayer/android/ijkplayer_android.h diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android_def.h b/ijkmedia/ijkplayer/android/ijkplayer_android_def.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android_def.h rename to ijkmedia/ijkplayer/android/ijkplayer_android_def.h diff --git a/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c b/ijkmedia/ijkplayer/android/ijkplayer_jni.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c rename to ijkmedia/ijkplayer/android/ijkplayer_jni.c diff --git a/ijkmediaplayer/jni/ijkplayer/ff_cmdutils.c b/ijkmedia/ijkplayer/ff_cmdutils.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_cmdutils.c rename to ijkmedia/ijkplayer/ff_cmdutils.c diff --git a/ijkmediaplayer/jni/ijkplayer/ff_cmdutils.h b/ijkmedia/ijkplayer/ff_cmdutils.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_cmdutils.h rename to ijkmedia/ijkplayer/ff_cmdutils.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_fferror.h b/ijkmedia/ijkplayer/ff_fferror.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_fferror.h rename to ijkmedia/ijkplayer/ff_fferror.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffinc.h b/ijkmedia/ijkplayer/ff_ffinc.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffinc.h rename to ijkmedia/ijkplayer/ff_ffinc.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffmsg.h b/ijkmedia/ijkplayer/ff_ffmsg.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffmsg.h rename to ijkmedia/ijkplayer/ff_ffmsg.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffmsg_queue.h b/ijkmedia/ijkplayer/ff_ffmsg_queue.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffmsg_queue.h rename to ijkmedia/ijkplayer/ff_ffmsg_queue.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay.c rename to ijkmedia/ijkplayer/ff_ffplay.c diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay.h b/ijkmedia/ijkplayer/ff_ffplay.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay.h rename to ijkmedia/ijkplayer/ff_ffplay.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay_config.h b/ijkmedia/ijkplayer/ff_ffplay_config.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay_config.h rename to ijkmedia/ijkplayer/ff_ffplay_config.h diff --git a/ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h b/ijkmedia/ijkplayer/ff_ffplay_def.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h rename to ijkmedia/ijkplayer/ff_ffplay_def.h diff --git a/ijkmediaplayer/jni/ijksdl/Android.mk b/ijkmedia/ijksdl/Android.mk similarity index 97% rename from ijkmediaplayer/jni/ijksdl/Android.mk rename to ijkmedia/ijksdl/Android.mk index d0219d19..b53bf906 100644 --- a/ijkmediaplayer/jni/ijksdl/Android.mk +++ b/ijkmedia/ijksdl/Android.mk @@ -23,8 +23,8 @@ LOCAL_CFLAGS += -std=c99 LOCAL_LDLIBS += -llog -landroid LOCAL_C_INCLUDES += $(LOCAL_PATH) +LOCAL_C_INCLUDES += $(realpath $(LOCAL_PATH)/..) LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH) -LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) LOCAL_SRC_FILES += ijksdl_aout.c LOCAL_SRC_FILES += ijksdl_error.c diff --git a/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c b/ijkmedia/ijksdl/android/android_audiotrack.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c rename to ijkmedia/ijksdl/android/android_audiotrack.c diff --git a/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h b/ijkmedia/ijksdl/android/android_audiotrack.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h rename to ijkmedia/ijksdl/android/android_audiotrack.h diff --git a/ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c b/ijkmedia/ijksdl/android/android_nativewindow.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c rename to ijkmedia/ijksdl/android/android_nativewindow.c diff --git a/ijkmediaplayer/jni/ijksdl/android/android_nativewindow.h b/ijkmedia/ijksdl/android/android_nativewindow.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/android_nativewindow.h rename to ijkmedia/ijksdl/android/android_nativewindow.h diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.c b/ijkmedia/ijksdl/android/ijksdl_android_jni.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.c rename to ijkmedia/ijksdl/android/ijksdl_android_jni.c diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.h b/ijkmedia/ijksdl/android/ijksdl_android_jni.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.h rename to ijkmedia/ijksdl/android/ijksdl_android_jni.h diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c b/ijkmedia/ijksdl/android/ijksdl_aout_android_audiotrack.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c rename to ijkmedia/ijksdl/android/ijksdl_aout_android_audiotrack.c diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h b/ijkmedia/ijksdl/android/ijksdl_aout_android_audiotrack.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h rename to ijkmedia/ijksdl/android/ijksdl_aout_android_audiotrack.h diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_inc_internal_android.h b/ijkmedia/ijksdl/android/ijksdl_inc_internal_android.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_inc_internal_android.h rename to ijkmedia/ijksdl/android/ijksdl_inc_internal_android.h diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c b/ijkmedia/ijksdl/android/ijksdl_vout_android_nativewindow.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c rename to ijkmedia/ijksdl/android/ijksdl_vout_android_nativewindow.c diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h b/ijkmedia/ijksdl/android/ijksdl_vout_android_nativewindow.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h rename to ijkmedia/ijksdl/android/ijksdl_vout_android_nativewindow.h diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c b/ijkmedia/ijksdl/android/ijksdl_vout_android_surface.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c rename to ijkmedia/ijksdl/android/ijksdl_vout_android_surface.c diff --git a/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h b/ijkmedia/ijksdl/android/ijksdl_vout_android_surface.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h rename to ijkmedia/ijksdl/android/ijksdl_vout_android_surface.h diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_all/image_convert.c b/ijkmedia/ijksdl/ffmpeg/abi_all/image_convert.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_all/image_convert.c rename to ijkmedia/ijksdl/ffmpeg/abi_all/image_convert.c diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/chroma_neon.h b/ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/chroma_neon.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/chroma_neon.h rename to ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/chroma_neon.h diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/i420_rgb.S b/ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/i420_rgb.S similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/i420_rgb.S rename to ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/i420_rgb.S diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/i420_rv16.S b/ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/i420_rv16.S similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/i420_rv16.S rename to ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/i420_rv16.S diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c b/ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c rename to ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/image_convert.c diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/nv12_rgb.S b/ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/nv12_rgb.S similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/nv12_rgb.S rename to ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/nv12_rgb.S diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/nv21_rgb.S b/ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/nv21_rgb.S similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/abi_armv7a_neon/nv21_rgb.S rename to ijkmedia/ijksdl/ffmpeg/abi_armv7a_neon/nv21_rgb.S diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_image_convert.h b/ijkmedia/ijksdl/ffmpeg/ijksdl_image_convert.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_image_convert.h rename to ijkmedia/ijksdl/ffmpeg/ijksdl_image_convert.h diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h b/ijkmedia/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h rename to ijkmedia/ijksdl/ffmpeg/ijksdl_inc_ffmpeg.h diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c b/ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c rename to ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c diff --git a/ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h b/ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h rename to ijkmedia/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl.h b/ijkmedia/ijksdl/ijksdl.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl.h rename to ijkmedia/ijksdl/ijksdl.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_android.h b/ijkmedia/ijksdl/ijksdl_android.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_android.h rename to ijkmedia/ijksdl/ijksdl_android.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_aout.c b/ijkmedia/ijksdl/ijksdl_aout.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_aout.c rename to ijkmedia/ijksdl/ijksdl_aout.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_aout.h b/ijkmedia/ijksdl/ijksdl_aout.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_aout.h rename to ijkmedia/ijksdl/ijksdl_aout.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h b/ijkmedia/ijksdl/ijksdl_aout_internal.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h rename to ijkmedia/ijksdl/ijksdl_aout_internal.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_audio.h b/ijkmedia/ijksdl/ijksdl_audio.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_audio.h rename to ijkmedia/ijksdl/ijksdl_audio.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_endian.h b/ijkmedia/ijksdl/ijksdl_endian.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_endian.h rename to ijkmedia/ijksdl/ijksdl_endian.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_error.c b/ijkmedia/ijksdl/ijksdl_error.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_error.c rename to ijkmedia/ijksdl/ijksdl_error.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_error.h b/ijkmedia/ijksdl/ijksdl_error.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_error.h rename to ijkmedia/ijksdl/ijksdl_error.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_fourcc.h b/ijkmedia/ijksdl/ijksdl_fourcc.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_fourcc.h rename to ijkmedia/ijksdl/ijksdl_fourcc.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_inc_internal.h b/ijkmedia/ijksdl/ijksdl_inc_internal.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_inc_internal.h rename to ijkmedia/ijksdl/ijksdl_inc_internal.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_mutex.c b/ijkmedia/ijksdl/ijksdl_mutex.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_mutex.c rename to ijkmedia/ijksdl/ijksdl_mutex.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_mutex.h b/ijkmedia/ijksdl/ijksdl_mutex.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_mutex.h rename to ijkmedia/ijksdl/ijksdl_mutex.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_stdinc.c b/ijkmedia/ijksdl/ijksdl_stdinc.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_stdinc.c rename to ijkmedia/ijksdl/ijksdl_stdinc.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_stdinc.h b/ijkmedia/ijksdl/ijksdl_stdinc.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_stdinc.h rename to ijkmedia/ijksdl/ijksdl_stdinc.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_thread.c b/ijkmedia/ijksdl/ijksdl_thread.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_thread.c rename to ijkmedia/ijksdl/ijksdl_thread.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_thread.h b/ijkmedia/ijksdl/ijksdl_thread.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_thread.h rename to ijkmedia/ijksdl/ijksdl_thread.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_timer.c b/ijkmedia/ijksdl/ijksdl_timer.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_timer.c rename to ijkmedia/ijksdl/ijksdl_timer.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_timer.h b/ijkmedia/ijksdl/ijksdl_timer.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_timer.h rename to ijkmedia/ijksdl/ijksdl_timer.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_video.h b/ijkmedia/ijksdl/ijksdl_video.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_video.h rename to ijkmedia/ijksdl/ijksdl_video.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_vout.c b/ijkmedia/ijksdl/ijksdl_vout.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_vout.c rename to ijkmedia/ijksdl/ijksdl_vout.c diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_vout.h b/ijkmedia/ijksdl/ijksdl_vout.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_vout.h rename to ijkmedia/ijksdl/ijksdl_vout.h diff --git a/ijkmediaplayer/jni/ijksdl/ijksdl_vout_internal.h b/ijkmedia/ijksdl/ijksdl_vout_internal.h similarity index 100% rename from ijkmediaplayer/jni/ijksdl/ijksdl_vout_internal.h rename to ijkmedia/ijksdl/ijksdl_vout_internal.h diff --git a/ijkmediaplayer/jni/ijkutil/Android.mk b/ijkmedia/ijkutil/Android.mk similarity index 100% rename from ijkmediaplayer/jni/ijkutil/Android.mk rename to ijkmedia/ijkutil/Android.mk diff --git a/ijkmediaplayer/jni/ijkutil/android/jnihelp.cpp b/ijkmedia/ijkutil/android/jnihelp.cpp similarity index 100% rename from ijkmediaplayer/jni/ijkutil/android/jnihelp.cpp rename to ijkmedia/ijkutil/android/jnihelp.cpp diff --git a/ijkmediaplayer/jni/ijkutil/android/jnihelp.h b/ijkmedia/ijkutil/android/jnihelp.h similarity index 100% rename from ijkmediaplayer/jni/ijkutil/android/jnihelp.h rename to ijkmedia/ijkutil/android/jnihelp.h diff --git a/ijkmediaplayer/jni/ijkutil/ijkutil.h b/ijkmedia/ijkutil/ijkutil.h similarity index 100% rename from ijkmediaplayer/jni/ijkutil/ijkutil.h rename to ijkmedia/ijkutil/ijkutil.h diff --git a/ijkmediaplayer/jni/ijkutil/ijkutil_android.h b/ijkmedia/ijkutil/ijkutil_android.h similarity index 100% rename from ijkmediaplayer/jni/ijkutil/ijkutil_android.h rename to ijkmedia/ijkutil/ijkutil_android.h diff --git a/ijkmediaplayer/jni/ijkutil/loghelp.c b/ijkmedia/ijkutil/loghelp.c similarity index 100% rename from ijkmediaplayer/jni/ijkutil/loghelp.c rename to ijkmedia/ijkutil/loghelp.c diff --git a/ijkmediaplayer/jni/ijkutil/loghelp.h b/ijkmedia/ijkutil/loghelp.h similarity index 100% rename from ijkmediaplayer/jni/ijkutil/loghelp.h rename to ijkmedia/ijkutil/loghelp.h -- GitLab