diff --git a/.gitignore b/.gitignore
index f2d73985f2..ae999cc4ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,6 @@ ios/ffmpeg-*
ios/openssl-*
extra
.DS_Store
-android/ijkmediaplayer/.settings/*
-android/ijkmediaplayer-x86/.settings/*
-android/ijkmediaplayer-armv5/.settings/*
-android/ijkmediaplayer-arm64-v8a/.settings/*
-android/ijkmediawidget/.settings/*
-android/ijkmediademo/.settings/*
-android/contrib/appcompat/.settings/
-android/ijkmediademo/lint.xml
ijkmedia/ijkyuv/
# built application files
diff --git a/NEWS.md b/NEWS.md
index 29fe692b57..316cdd56cd 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,8 @@
tag next
--------------------------------
+android: support build with Android Studio / Gradle
+build: improve library fetch
+openssl: switch to openssl 1.0.1o
tag k0.2.4
--------------------------------
diff --git a/android/.gitignore b/android/.gitignore
index 378eac25d3..06e3b7af50 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1 +1,86 @@
-build
+#--------------------
+# Android.gitignore
+# https://github.com/github/gitignore/blob/master/Android.gitignore
+#--------------------
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+#--------------------
+# Gradle.gitignore
+# https://github.com/github/gitignore/blob/master/Gradle.gitignore
+#--------------------
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+
+#--------------------
+# Android Studio .gitignore
+# https://gist.github.com/iainconnor/8605514
+#--------------------
+# Built application files
+/*/build/
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# User-specific configurations
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+*.iml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/android/android.iml b/android/android.iml
deleted file mode 100644
index 106118e69c..0000000000
--- a/android/android.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/build.gradle b/android/build.gradle
deleted file mode 100644
index 0f358b5a24..0000000000
--- a/android/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.1.0'
- }
-}
-
-allprojects{
- repositories {
- mavenCentral()
- }
-}
-
-
diff --git a/android/compile-ijk.sh b/android/compile-ijk.sh
index 7cad325c8d..c4cbc68a44 100755
--- a/android/compile-ijk.sh
+++ b/android/compile-ijk.sh
@@ -28,22 +28,22 @@ do_ndk_build () {
PARAM_TARGET=$1
case "$PARAM_TARGET" in
armv7a)
- cd ijkmediaplayer/jni
+ cd ijkplayer/player-armv7a/src/main/jni
$ANDROID_NDK/ndk-build
cd -
;;
armv5)
- cd ijkmediaplayer-armv5/jni
+ cd ijkplayer/player-armv5/src/main/jni
$ANDROID_NDK/ndk-build
cd -
;;
x86)
- cd ijkmediaplayer-x86/jni
+ cd ijkplayer/player-x86/src/main/jni
$ANDROID_NDK/ndk-build
cd -
;;
- arm64-v8a)
- cd ijkmediaplayer-arm64-v8a/jni
+ arm64)
+ cd ijkplayer/player-arm64/src/main/jni
$ANDROID_NDK/ndk-build
cd -
;;
@@ -55,7 +55,7 @@ case "$REQUEST_TARGET" in
"")
do_ndk_build armv7a;
;;
- armv5|armv7a|x86|arm64-v8a)
+ armv5|armv7a|x86|arm64)
do_ndk_build $REQUEST_TARGET;
;;
all)
@@ -66,7 +66,7 @@ case "$REQUEST_TARGET" in
;;
*)
echo "Usage:"
- echo " compile-ijk.sh armv5|armv7a|x86|arm64-v8a"
+ echo " compile-ijk.sh armv5|armv7a|x86|arm64"
echo " compile-ijk.sh all"
;;
esac
diff --git a/android/contrib/.gitignore b/android/contrib/.gitignore
new file mode 100644
index 0000000000..2eaacedda4
--- /dev/null
+++ b/android/contrib/.gitignore
@@ -0,0 +1,3 @@
+build
+ffmpeg-*
+openssl-*
diff --git a/android/contrib/appcompat/.settings/org.eclipse.jdt.core.prefs b/android/contrib/appcompat/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/contrib/appcompat/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/contrib/appcompat/AndroidManifest.xml b/android/contrib/appcompat/AndroidManifest.xml
index dac4cb27ed..58368e469e 100644
--- a/android/contrib/appcompat/AndroidManifest.xml
+++ b/android/contrib/appcompat/AndroidManifest.xml
@@ -15,6 +15,6 @@
-->
-
+
diff --git a/android/contrib/appcompat/libs/android-support-v4.jar b/android/contrib/appcompat/libs/android-support-v4.jar
index 1437d24e63..e74b0d77d2 100644
Binary files a/android/contrib/appcompat/libs/android-support-v4.jar and b/android/contrib/appcompat/libs/android-support-v4.jar differ
diff --git a/android/contrib/appcompat/libs/android-support-v7-appcompat.jar b/android/contrib/appcompat/libs/android-support-v7-appcompat.jar
index a5268c2141..b9dca8a789 100644
Binary files a/android/contrib/appcompat/libs/android-support-v7-appcompat.jar and b/android/contrib/appcompat/libs/android-support-v7-appcompat.jar differ
diff --git a/android/contrib/appcompat/res/anim/abc_popup_enter.xml b/android/contrib/appcompat/res/anim/abc_popup_enter.xml
new file mode 100644
index 0000000000..91664da17e
--- /dev/null
+++ b/android/contrib/appcompat/res/anim/abc_popup_enter.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/anim/abc_popup_exit.xml b/android/contrib/appcompat/res/anim/abc_popup_exit.xml
new file mode 100644
index 0000000000..db7e8073a8
--- /dev/null
+++ b/android/contrib/appcompat/res/anim/abc_popup_exit.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/color-v11/abc_background_cache_hint_selector_material_dark.xml b/android/contrib/appcompat/res/color-v11/abc_background_cache_hint_selector_material_dark.xml
new file mode 100644
index 0000000000..e0160766e0
--- /dev/null
+++ b/android/contrib/appcompat/res/color-v11/abc_background_cache_hint_selector_material_dark.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ - 8dp
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/layout-v11/abc_screen_content_include.xml b/android/contrib/appcompat/res/values-v18/dimens.xml
similarity index 61%
rename from android/contrib/appcompat/res/layout-v11/abc_screen_content_include.xml
rename to android/contrib/appcompat/res/values-v18/dimens.xml
index 757be1c1df..bb784b76b9 100644
--- a/android/contrib/appcompat/res/layout-v11/abc_screen_content_include.xml
+++ b/android/contrib/appcompat/res/values-v18/dimens.xml
@@ -14,13 +14,9 @@
limitations under the License.
-->
-
+
-
+
+ 0px
-
+
diff --git a/android/contrib/appcompat/res/values-v21/styles_base.xml b/android/contrib/appcompat/res/values-v21/styles_base.xml
index 6a352ef460..1bf90ef253 100644
--- a/android/contrib/appcompat/res/values-v21/styles_base.xml
+++ b/android/contrib/appcompat/res/values-v21/styles_base.xml
@@ -78,6 +78,7 @@
-
+
+
@@ -179,6 +180,16 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- - ?android:attr/listPreferredItemHeightSmall
- - ?android:attr/textAppearanceLargePopupMenu
- - ?android:attr/textAppearanceSmallPopupMenu
+
-
- - ?android:attr/selectableItemBackground
- - ?android:attr/selectableItemBackgroundBorderless
- - ?android:attr/dividerHorizontal
- - ?android:attr/dividerVertical
- - ?android:attr/editTextBackground
- - ?android:attr/editTextColor
- - ?android:attr/listChoiceBackgroundIndicator
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/contrib/appcompat/res/values-vi/strings.xml b/android/contrib/appcompat/res/values-vi/strings.xml
index 28b93ab032..0840f7391f 100644
--- a/android/contrib/appcompat/res/values-vi/strings.xml
+++ b/android/contrib/appcompat/res/values-vi/strings.xml
@@ -20,9 +20,6 @@
"Điều hướng về trang chủ"
"Điều hướng lên trên"
"Thêm tùy chọn"
- "Thu gọn"
- "%1$s, %2$s"
- "%1$s, %2$s, %3$s"
"Tìm kiếm"
"Tìm kiếm truy vấn"
"Xóa truy vấn"
diff --git a/android/contrib/appcompat/res/values-zh-rCN/strings.xml b/android/contrib/appcompat/res/values-zh-rCN/strings.xml
index 519abd21fe..87b36b0be9 100644
--- a/android/contrib/appcompat/res/values-zh-rCN/strings.xml
+++ b/android/contrib/appcompat/res/values-zh-rCN/strings.xml
@@ -20,9 +20,6 @@
"转到主屏幕"
"转到上一层级"
"更多选项"
- "收起"
- "%1$s：%2$s"
- "%1$s - %2$s：%3$s"
"搜索"
"搜索查询"
"清除查询"
diff --git a/android/contrib/appcompat/res/values-zh-rHK/strings.xml b/android/contrib/appcompat/res/values-zh-rHK/strings.xml
index 4974223175..f6a367d3a0 100644
--- a/android/contrib/appcompat/res/values-zh-rHK/strings.xml
+++ b/android/contrib/appcompat/res/values-zh-rHK/strings.xml
@@ -20,9 +20,6 @@
"瀏覽主頁"
"向上瀏覽"
"更多選項"
- "收合"
- "%1$s：%2$s"
- "%1$s (%2$s)：%3$s"
"搜尋"
"搜尋查詢"
"清除查詢"
diff --git a/android/contrib/appcompat/res/values-zh-rTW/strings.xml b/android/contrib/appcompat/res/values-zh-rTW/strings.xml
index 97f258956c..c804ccf3a9 100644
--- a/android/contrib/appcompat/res/values-zh-rTW/strings.xml
+++ b/android/contrib/appcompat/res/values-zh-rTW/strings.xml
@@ -20,9 +20,6 @@
"瀏覽首頁"
"向上瀏覽"
"更多選項"
- "收合"
- "%1$s：%2$s"
- "%1$s - %2$s：%3$s"
"搜尋"
"搜尋查詢"
"清除查詢"
diff --git a/android/contrib/appcompat/res/values-zu/strings.xml b/android/contrib/appcompat/res/values-zu/strings.xml
index 21ee299805..92eac7ecaf 100644
--- a/android/contrib/appcompat/res/values-zu/strings.xml
+++ b/android/contrib/appcompat/res/values-zu/strings.xml
@@ -20,9 +20,6 @@
"Zulazulela ekhaya"
"Zulazulela phezulu"
"Izinketho eziningi"
- "Goqa"
- "%1$s, %2$s"
- "%1$s, %2$s, %3$s"
"Sesha"
"Umbuzo wosesho"
"Sula inkinga"
diff --git a/android/contrib/appcompat/res/values/attrs.xml b/android/contrib/appcompat/res/values/attrs.xml
index 3fd90b2be1..a7b51c1cc8 100644
--- a/android/contrib/appcompat/res/values/attrs.xml
+++ b/android/contrib/appcompat/res/values/attrs.xml
@@ -42,6 +42,9 @@
in place of the usual title bar. -->
+
+
+
@@ -69,6 +72,17 @@
or a fraction of the screen size in that dimension. -->
+
+
+
+
+
@@ -162,6 +176,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -171,9 +197,6 @@
-
-
-
@@ -182,11 +205,9 @@
-
+
-
+
+
+
@@ -216,9 +239,6 @@
-
-
-
@@ -305,6 +325,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -432,6 +500,35 @@
always request focus regardless of this view. It only impacts where
focus navigation will try to move focus. -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -615,8 +712,11 @@
-
+
+
+
@@ -627,6 +727,8 @@
+
+
@@ -653,9 +755,10 @@
-
+
+
@@ -719,12 +822,6 @@
-
-
-
@@ -814,10 +911,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/contrib/appcompat/res/values/colors.xml b/android/contrib/appcompat/res/values/colors.xml
index 32142019f0..0ce01d2b2a 100644
--- a/android/contrib/appcompat/res/values/colors.xml
+++ b/android/contrib/appcompat/res/values/colors.xml
@@ -19,4 +19,6 @@
@android:color/black
@android:color/black
+
+ #3333B5E5
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/values/colors_material.xml b/android/contrib/appcompat/res/values/colors_material.xml
index 94448b5800..6b3cca5d48 100644
--- a/android/contrib/appcompat/res/values/colors_material.xml
+++ b/android/contrib/appcompat/res/values/colors_material.xml
@@ -23,12 +23,12 @@
#ffeeeeee
#ff212121
- #ffbdbdbd
+ #ffefefef
#ff000000
#ff757575
- #40ffffff
- #40000000
+ #4dffffff
+ #1f000000
@color/material_deep_teal_500
@color/material_deep_teal_200
@@ -38,6 +38,8 @@
#ffbdbdbd
#fff1f1f1
+ #ff616161
+ #ffbdbdbd
@android:color/white
@android:color/black
diff --git a/android/contrib/appcompat/res/values/config.xml b/android/contrib/appcompat/res/values/config.xml
index 0f8b7dcebf..e0c521bdaa 100644
--- a/android/contrib/appcompat/res/values/config.xml
+++ b/android/contrib/appcompat/res/values/config.xml
@@ -36,4 +36,13 @@
150
220
+ true
+
+
+ 999
+
+ 127
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/values/dimens.xml b/android/contrib/appcompat/res/values/dimens.xml
index 34a81a6881..06f1a06fa8 100644
--- a/android/contrib/appcompat/res/values/dimens.xml
+++ b/android/contrib/appcompat/res/values/dimens.xml
@@ -71,4 +71,39 @@
2dp
+ 4dp
+ 10dp
+ 7dp
+
+
+ 3dp
+
+ 24dp
+ 18dp
+
+
+ 48dp
+
+
+ 8dp
+
+
+ - 65%
+
+
+ - 95%
+
+
+ 64dp
+
+
+ 64dp
+
+
+ 12dp
diff --git a/android/contrib/appcompat/res/values/dimens_material.xml b/android/contrib/appcompat/res/values/dimens_material.xml
index a620b31079..2d0f738133 100644
--- a/android/contrib/appcompat/res/values/dimens_material.xml
+++ b/android/contrib/appcompat/res/values/dimens_material.xml
@@ -20,6 +20,8 @@
56dp
4dp
+
+ 16dp
16dp
@@ -27,6 +29,17 @@
5dp
+
+ @dimen/abc_action_bar_content_inset_material
+
+
+ 0dp
+
+ 6dp
+
+ 10dp
+
36dp
48dp
48dp
@@ -41,8 +54,8 @@
20dp
16dp
16sp
- 16sp
- 16sp
+ 14sp
+ 14sp
12sp
14sp
@@ -50,4 +63,9 @@
18sp
14sp
+ 16dp
+
+ - 0.26
+ - 0.30
+
diff --git a/android/contrib/appcompat/res/values/strings.xml b/android/contrib/appcompat/res/values/strings.xml
index 5080070da9..a04b396f99 100644
--- a/android/contrib/appcompat/res/values/strings.xml
+++ b/android/contrib/appcompat/res/values/strings.xml
@@ -41,6 +41,8 @@
Search
+
+ Search…
Search query
@@ -60,4 +62,10 @@
Share with
+
+ 999+
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/values/styles.xml b/android/contrib/appcompat/res/values/styles.xml
index f80aae5c9d..b38c6ad94d 100644
--- a/android/contrib/appcompat/res/values/styles.xml
+++ b/android/contrib/appcompat/res/values/styles.xml
@@ -60,8 +60,7 @@
-
-
+
@@ -129,9 +128,8 @@
-
+
+
+
+
+
+
+
+
+
@@ -298,4 +321,11 @@
+
+
+
+
+
+
diff --git a/android/contrib/appcompat/res/values/styles_base.xml b/android/contrib/appcompat/res/values/styles_base.xml
index fb28f4ed6e..0feb530989 100644
--- a/android/contrib/appcompat/res/values/styles_base.xml
+++ b/android/contrib/appcompat/res/values/styles_base.xml
@@ -37,6 +37,8 @@
- @style/Widget.AppCompat.ActionButton.Overflow
- center_vertical
+ - @dimen/abc_action_bar_content_inset_material
+ - @dimen/abc_action_bar_content_inset_material
- 8dp
- ?attr/actionBarPopupTheme
@@ -72,6 +74,7 @@
-
+
+
@@ -281,7 +287,9 @@
- ?android:textColorSecondary
-
-
+
+
+
+
+
+
+
+
+
@@ -390,6 +420,22 @@
- 48dip
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/contrib/appcompat/res/values/styles_rtl.xml b/android/contrib/appcompat/res/values/styles_rtl.xml
index fad129176f..db23019097 100644
--- a/android/contrib/appcompat/res/values/styles_rtl.xml
+++ b/android/contrib/appcompat/res/values/styles_rtl.xml
@@ -47,14 +47,9 @@
- 8dp
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/contrib/appcompat/res/values/themes.xml b/android/contrib/appcompat/res/values/themes.xml
index 3409c6873d..f8962df6b4 100644
--- a/android/contrib/appcompat/res/values/themes.xml
+++ b/android/contrib/appcompat/res/values/themes.xml
@@ -36,12 +36,12 @@
+
+
+
+
+
+
+
+
+
-
+
diff --git a/android/contrib/appcompat/res/values/themes_base.xml b/android/contrib/appcompat/res/values/themes_base.xml
index c151d3b5b9..3e2c841f2f 100644
--- a/android/contrib/appcompat/res/values/themes_base.xml
+++ b/android/contrib/appcompat/res/values/themes_base.xml
@@ -25,15 +25,12 @@
@@ -71,15 +64,12 @@
-
-
-
-
+ - @style/Widget.AppCompat.Spinner
+ - @style/Widget.AppCompat.TextView.SpinnerItem
+ - @style/Widget.AppCompat.ListView.DropDown
- @style/Widget.AppCompat.DropDownItem.Spinner
@@ -260,10 +204,10 @@
- @style/Widget.AppCompat.Toolbar
- @style/Widget.AppCompat.Toolbar.Button.Navigation
- - @style/Widget.AppCompat.EditText
+ - @style/Widget.AppCompat.EditText
- @drawable/abc_edit_text_material
- ?android:attr/textColorPrimary
- - @style/Widget.AppCompat.AutoCompleteTextView
+ - @style/Widget.AppCompat.AutoCompleteTextView
- @color/primary_dark_material_dark
@@ -274,18 +218,43 @@
- ?attr/colorAccent
- @color/ripple_material_dark
- @color/button_material_dark
- - @color/switch_thumb_normal_material_dark
+ - @color/switch_thumb_material_dark
- @style/Widget.AppCompat.DrawerArrowToggle
+ - @style/Widget.AppCompat.CompoundButton.CheckBox
+ - @style/Widget.AppCompat.CompoundButton.RadioButton
- @style/Widget.AppCompat.CompoundButton.Switch
- - @style/Widget.AppCompat.RatingBar
+ - @style/Widget.AppCompat.RatingBar
- - @style/Widget.AppCompat.Button
- - @style/Widget.AppCompat.Button.Small
+ - @style/Widget.AppCompat.Button
+ - @style/Widget.AppCompat.Button.Small
- @style/TextAppearance.AppCompat.Button
+
+ - @style/Widget.AppCompat.ButtonBar
+ - @style/Widget.AppCompat.Button.ButtonBar.AlertDialog
+ - ?attr/buttonBarButtonStyle
+ - ?attr/buttonBarButtonStyle
+ - ?attr/buttonBarButtonStyle
+
+
+ - @style/Theme.AppCompat.Dialog
+ - @dimen/abc_dialog_padding_material
+
+ - @style/Theme.AppCompat.Dialog.Alert
+ - @style/AlertDialog.AppCompat
+ - false
+ - @color/abc_primary_text_material_dark
+ - @null
+
+
+ - 0dp
+ - 0dp
+ - 0dp
+ - 0dp
@@ -298,6 +267,7 @@
- @drawable/abc_item_background_holo_light
- ?attr/selectableItemBackground
+ - @style/Widget.AppCompat.Button.Borderless
- @drawable/abc_ic_ab_back_mtrl_am_alpha
- @drawable/abc_list_divider_mtrl_alpha
@@ -349,8 +319,13 @@
- 64dp
- 48dp
- 80dp
- - 16dip
- - 16dip
+ - @dimen/abc_list_item_padding_horizontal_material
+ - @dimen/abc_list_item_padding_horizontal_material
+
+
+ - @style/Widget.AppCompat.Spinner
+ - @style/Widget.AppCompat.TextView.SpinnerItem
+ - @style/Widget.AppCompat.ListView.DropDown
- @style/Widget.AppCompat.DropDownItem.Spinner
@@ -377,10 +352,10 @@
- @style/Widget.AppCompat.Toolbar
- @style/Widget.AppCompat.Toolbar.Button.Navigation
- - @style/Widget.AppCompat.EditText
+ - @style/Widget.AppCompat.EditText
- @drawable/abc_edit_text_material
- ?android:attr/textColorPrimary
- - @style/Widget.AppCompat.AutoCompleteTextView
+ - @style/Widget.AppCompat.AutoCompleteTextView
- @color/primary_dark_material_light
@@ -391,18 +366,43 @@
- ?attr/colorAccent
- @color/ripple_material_light
- @color/button_material_light
- - @color/switch_thumb_normal_material_light
+ - @color/switch_thumb_material_light
- @style/Widget.AppCompat.DrawerArrowToggle
+ - @style/Widget.AppCompat.CompoundButton.CheckBox
+ - @style/Widget.AppCompat.CompoundButton.RadioButton
- @style/Widget.AppCompat.CompoundButton.Switch
- - @style/Widget.AppCompat.RatingBar
+ - @style/Widget.AppCompat.RatingBar
- - @style/Widget.AppCompat.Button
- - @style/Widget.AppCompat.Button.Small
+ - @style/Widget.AppCompat.Button
+ - @style/Widget.AppCompat.Button.Small
- @style/TextAppearance.AppCompat.Button
+
+ - @style/Widget.AppCompat.ButtonBar
+ - @style/Widget.AppCompat.Button.ButtonBar.AlertDialog
+ - ?attr/buttonBarButtonStyle
+ - ?attr/buttonBarButtonStyle
+ - ?attr/buttonBarButtonStyle
+
+
+ - @style/Theme.AppCompat.Light.Dialog
+ - @dimen/abc_dialog_padding_material
+
+ - @style/Theme.AppCompat.Light.Dialog.Alert
+ - @style/AlertDialog.AppCompat.Light
+ - false
+ - @color/abc_primary_text_material_light
+ - @null
+
+
+ - 0dp
+ - 0dp
+ - 0dp
+ - 0dp
-
-
-
-
- - @style/Widget.AppCompat.ActivityChooserView
+
- - @style/Widget.AppCompat.CompoundButton.Switch
+
+
- - @style/Widget.AppCompat.RatingBar
+
-
- - @style/Widget.AppCompat.Button
- - @style/Widget.AppCompat.Button.Small
- - @style/TextAppearance.AppCompat.Button
+
-
+
-
+
+
+
+
+
diff --git a/android/compile-ffmpeg.sh b/android/contrib/compile-ffmpeg.sh
similarity index 93%
rename from android/compile-ffmpeg.sh
rename to android/contrib/compile-ffmpeg.sh
index aa1e64040c..fdd7e8ca2e 100755
--- a/android/compile-ffmpeg.sh
+++ b/android/contrib/compile-ffmpeg.sh
@@ -25,7 +25,7 @@ FF_TARGET=$1
set -e
set +x
-FF_ALL_ARCHS="armv5 armv7a x86 arm64-v8a"
+FF_ALL_ARCHS="armv5 armv7a x86 arm64"
FF_ACT_ARCHS="armv5 armv7a x86"
echo_archs() {
@@ -43,7 +43,7 @@ case "$FF_TARGET" in
echo_archs
sh tools/do-compile-ffmpeg.sh armv7a
;;
- armv5|armv7a|x86|arm64-v8a)
+ armv5|armv7a|x86|arm64)
echo_archs
sh tools/do-compile-ffmpeg.sh $FF_TARGET
;;
@@ -67,7 +67,7 @@ case "$FF_TARGET" in
;;
*)
echo "Usage:"
- echo " compile-ffmpeg.sh armv5|armv7a|x86|arm64-v8a"
+ echo " compile-ffmpeg.sh armv5|armv7a|x86|arm64"
echo " compile-ffmpeg.sh all"
echo " compile-ffmpeg.sh clean"
echo " compile-ffmpeg.sh check"
diff --git a/android/compile-openssl.sh b/android/contrib/compile-openssl.sh
similarity index 100%
rename from android/compile-openssl.sh
rename to android/contrib/compile-openssl.sh
diff --git a/android/setup-as-commiter.sh b/android/contrib/setup-as-commiter.sh
similarity index 100%
rename from android/setup-as-commiter.sh
rename to android/contrib/setup-as-commiter.sh
diff --git a/android/sync-mirrors.sh b/android/contrib/sync-mirrors.sh
similarity index 100%
rename from android/sync-mirrors.sh
rename to android/contrib/sync-mirrors.sh
diff --git a/android/tools/do-compile-ffmpeg.sh b/android/contrib/tools/do-compile-ffmpeg.sh
similarity index 98%
rename from android/tools/do-compile-ffmpeg.sh
rename to android/contrib/tools/do-compile-ffmpeg.sh
index dc42b5b9eb..102e50c306 100755
--- a/android/tools/do-compile-ffmpeg.sh
+++ b/android/contrib/tools/do-compile-ffmpeg.sh
@@ -127,11 +127,11 @@ elif [ "$FF_ARCH" = "x86" ]; then
FF_ASM_OBJ_DIR="libavutil/x86/*.o libavcodec/x86/*.o libswresample/x86/*.o libswscale/x86/*.o"
-elif [ "$FF_ARCH" = "arm64-v8a" ]; then
+elif [ "$FF_ARCH" = "arm64" ]; then
FF_ANDROID_PLATFORM=android-21
- FF_BUILD_NAME=ffmpeg-arm64-v8a
- FF_BUILD_NAME_OPENSSL=openssl-arm64-v8a
+ FF_BUILD_NAME=ffmpeg-arm64
+ FF_BUILD_NAME_OPENSSL=openssl-arm64
FF_SOURCE=$FF_BUILD_ROOT/$FF_BUILD_NAME
FF_CROSS_PREFIX=aarch64-linux-android
@@ -219,7 +219,7 @@ FF_CFLAGS="-O3 -Wall -pipe \
#FF_CFLAGS="$FF_CFLAGS -finline-limit=300"
export COMMON_FF_CFG_FLAGS=
-. $FF_BUILD_ROOT/../config/module.sh
+. $FF_BUILD_ROOT/../../config/module.sh
#--------------------
diff --git a/android/tools/do-compile-openssl.sh b/android/contrib/tools/do-compile-openssl.sh
similarity index 100%
rename from android/tools/do-compile-openssl.sh
rename to android/contrib/tools/do-compile-openssl.sh
diff --git a/android/gradle/compile-ijkplayer.gradle b/android/gradle/compile-ijkplayer.gradle
deleted file mode 100644
index c45e8efe40..0000000000
--- a/android/gradle/compile-ijkplayer.gradle
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2015. Yrom
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-def TASK_GROUP = 'Build ijkplayer'
-def FF_ALL_ARCHES = ['armv5', 'armv7a', 'x86', 'arm64-v8a']
-def LIB_NAMES = ['armeabi', 'armeabi-v7a', 'x86', 'arm64-v8a']
-def FF_COMPILE_PREFIX = 'compileFFmpeg'
-def BUILD_LIBS_PREFIX = 'compileLibs'
-
-def String getAndroidNdkDir(){
- String path = hasProperty('ANDROID_NDK')? ANDROID_NDK : System.env.ANDROID_NDK
- def ndkDir = file(path)
- if(!ndkDir.exists())
- throw new FileNotFoundException("The ANDROID_NDK is not found: ${ndkDir}")
- return ndkDir.absolutePath
-}
-
-tasks.addRule("Pattern: $FF_COMPILE_PREFIX") { String taskName ->
- if(taskName.startsWith(FF_COMPILE_PREFIX)) {
- def arch = taskName - FF_COMPILE_PREFIX
- arch = arch ? arch.toLowerCase() : 'armv7a'
- task(taskName, group: TASK_GROUP, description: "Compile ffmpeg-${arch}", type: Exec) {
- workingDir = rootProject.rootDir.absolutePath
- environment.ANDROID_SDK = android.sdkDirectory
- environment.ANDROID_NDK = getAndroidNdkDir()
- def output = new File(rootProject.buildDir, "ffmpeg-${arch}/output")
- inputs.sourceDir(rootProject.file("ffmpeg-${arch}"))
- outputs.dir(output)
- commandLine 'sh', 'tools/do-compile-ffmpeg.sh', arch
- }
- }
-}
-
-tasks.addRule("Pattern: ${BUILD_LIBS_PREFIX}") { String taskName ->
- if(taskName.startsWith(BUILD_LIBS_PREFIX)) {
- def abi = taskName - BUILD_LIBS_PREFIX
- abi = abi ? abi.toLowerCase() : 'armv7a'
- if (FF_ALL_ARCHES.indexOf(abi) >= 0) {
- def abiName = LIB_NAMES[FF_ALL_ARCHES.indexOf(abi)]
- def soDir = project.file('libs')
- def objDir = project.file("$project.buildDir/intermediates/ndk/obj")
- def task = task(taskName,
- group: TASK_GROUP,
- description: "Build ijkplayer for abi ${abiName}",
- type: Exec) {
- environment.ANDROID_SDK = android.sdkDirectory
- environment.ANDROID_NDK = getAndroidNdkDir()
- def exec = new File(file(environment.ANDROID_NDK), 'ndk-build')
- if(!exec.canExecute()){
- throw new StopExecutionException("The command \'ndk-build\' cannot be executed: $exec")
- }
- workingDir = project.file('jni').absolutePath
- inputs.sourceDir(workingDir)
- outputs.dir(soDir)
- executable = exec.absolutePath
- args = ["NDK_OUT=${objDir.absolutePath}", // temp out
- "NDK_LIBS_OUT=${soDir.absolutePath}" // libs out
- ]
- }
- task.dependsOn FF_COMPILE_PREFIX + abi.capitalize()
-
- } else {
- throw new GradleException("Wrong argument for : ${abi}")
- }
- }
-}
-afterEvaluate { project->
- if(!plugins.hasPlugin('com.android.library')){
- logger.log(LogLevel.WARN, 'Must apply this script to android library project.')
- return
- }
- def ndkDir = getAndroidNdkDir();
- if(!ndkDir) {
- logger.log(LogLevel.WARN, 'You must define ANDROID_NDK in System env or gradle.properties before build.')
- return
- }
- def matcher = java.util.regex.Pattern.compile("ijkmediaplayer(?:-(\\S+))?").matcher(name)
- if(matcher.find()){
- def abi = matcher.group(1)
- abi = abi ?: 'armv7a'
- def buildTask = BUILD_LIBS_PREFIX+abi.capitalize()
- def buildLibsTask = tasks.create("buildJniLibs", new Action() {
- @Override
- public void execute(Task task) {
- task.description = "Build jni libs for the subproject ${name}."
- task.group = TASK_GROUP
- task.outputs.dir(project.file('libs'))
- task.dependsOn buildTask
- }
- })
- android.libraryVariants.each{ variant ->
- def packageJniLibs = tasks.getByName("package${variant.name.capitalize()}JniLibs") as Sync
- packageJniLibs.from(project.file('libs')).include("**/*.so")
- packageJniLibs.dependsOn buildLibsTask
- }
- def cleanTask = tasks.create(name:"cleanJniLibs",
- group: TASK_GROUP,
- description:"Clean ${name} outputs") << {
- delete buildLibsTask, tasks.getByName(FF_COMPILE_PREFIX + abi.capitalize())
- }
- tasks.clean.dependsOn cleanTask
-
- def cleanFFmpegTask = tasks.create(name:"cleanFFmpeg",
- group: TASK_GROUP,
- dependsOn: cleanTask,
- description: "Deep clean /ffmpeg-$abi and builds") <<{
- def dir = rootProject.file("ffmpeg-$abi")
- println "Cleaning directory $dir"
- exec{
- workingDir = dir
- commandLine = ['sh', '-c', "git clean -xdf"]
- }
- }
- println "Added task ${buildLibsTask.name}, ${cleanTask.name}, ${cleanFFmpegTask.name} to project:${name}"
-
- }
-
-}
\ No newline at end of file
diff --git a/android/ijkmediademo/.settings/org.eclipse.core.resources.prefs b/android/ijkmediademo/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203..0000000000
--- a/android/ijkmediademo/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/android/ijkmediademo/.settings/org.eclipse.core.runtime.prefs b/android/ijkmediademo/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a..0000000000
--- a/android/ijkmediademo/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/android/ijkmediademo/build.gradle b/android/ijkmediademo/build.gradle
deleted file mode 100644
index 622db40d51..0000000000
--- a/android/ijkmediademo/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-apply plugin: 'com.android.application'
-
-dependencies {
- compile fileTree(dir: 'libs', include: '*.jar')
- compile project(':ijkmediawidget')
- compile project(':ijkmediaplayer')
-// compile project(':ijkmediaplayer-x86')
-
- compile 'com.android.support:appcompat-v7:22.0.0'
- compile 'com.android.support:support-v4:22.0.0'
-}
-
-android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
-
- defaultConfig {
- minSdkVersion 9
- targetSdkVersion 22
- versionCode 102
- versionName "0.2"
- }
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- jniLibs.srcDirs = ['libs']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-
- lintOptions{
- abortOnError false
- }
-}
diff --git a/android/ijkmediademo/ijkmediademo.iml b/android/ijkmediademo/ijkmediademo.iml
deleted file mode 100644
index d05d5dd8e0..0000000000
--- a/android/ijkmediademo/ijkmediademo.iml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediademo/res/drawable-hdpi/ic_launcher.png b/android/ijkmediademo/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5b8..0000000000
Binary files a/android/ijkmediademo/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/ijkmediademo/res/drawable-mdpi/ic_launcher.png b/android/ijkmediademo/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa4..0000000000
Binary files a/android/ijkmediademo/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/ijkmediademo/res/drawable-xhdpi/ic_launcher.png b/android/ijkmediademo/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760f0..0000000000
Binary files a/android/ijkmediademo/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/ijkmediademo/res/values/strings.xml b/android/ijkmediademo/res/values/strings.xml
deleted file mode 100644
index 1a5e8fbab3..0000000000
--- a/android/ijkmediademo/res/values/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- ijkmediademo
- Dummy Button
- DUMMY\nCONTENT
-
- buffering
- Sort
-
-
diff --git a/android/ijkmediademo/res/values/styles.xml b/android/ijkmediademo/res/values/styles.xml
deleted file mode 100644
index c5d5790f6e..0000000000
--- a/android/ijkmediademo/res/values/styles.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/.project b/android/ijkmediaplayer-arm64-v8a/.project
deleted file mode 100644
index 7b73d8b3e7..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- ijkmediaplayer-arm64-v8a
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/android/ijkmediaplayer-arm64-v8a/AndroidManifest.xml b/android/ijkmediaplayer-arm64-v8a/AndroidManifest.xml
deleted file mode 100644
index 5c4aaadbd7..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/build.gradle b/android/ijkmediaplayer-arm64-v8a/build.gradle
deleted file mode 100644
index 45c81e600b..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- jniLibs.srcDirs = ['libs']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-}
-apply from: rootProject.file('gradle/compile-ijkplayer.gradle')
diff --git a/android/ijkmediaplayer-arm64-v8a/ijkmediaplayer-arm64-v8a.iml b/android/ijkmediaplayer-arm64-v8a/ijkmediaplayer-arm64-v8a.iml
deleted file mode 100644
index 42bc6c4f59..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/ijkmediaplayer-arm64-v8a.iml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer-arm64-v8a/jni/Android.mk b/android/ijkmediaplayer-arm64-v8a/jni/Android.mk
deleted file mode 120000
index fe0a0ae4ba..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/jni/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-../../ijkmediaplayer/jni/Android.mk
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/jni/ffmpeg b/android/ijkmediaplayer-arm64-v8a/jni/ffmpeg
deleted file mode 120000
index d4ccfb5c15..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/jni/ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-../../ijkmediaplayer/jni/ffmpeg
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/jni/ijkmedia b/android/ijkmediaplayer-arm64-v8a/jni/ijkmedia
deleted file mode 120000
index 5bb840c589..0000000000
--- a/android/ijkmediaplayer-arm64-v8a/jni/ijkmedia
+++ /dev/null
@@ -1 +0,0 @@
-../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/build.gradle b/android/ijkmediaplayer-armv5/build.gradle
deleted file mode 100644
index 090ba42e60..0000000000
--- a/android/ijkmediaplayer-armv5/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- jniLibs.srcDirs = ['libs']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-}
-apply from: rootProject.file('gradle/compile-ijkplayer.gradle')
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/build.xml b/android/ijkmediaplayer-armv5/build.xml
deleted file mode 100644
index 766f990a8d..0000000000
--- a/android/ijkmediaplayer-armv5/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer-armv5/ijkmediaplayer-armv5.iml b/android/ijkmediaplayer-armv5/ijkmediaplayer-armv5.iml
deleted file mode 100644
index 39992c013a..0000000000
--- a/android/ijkmediaplayer-armv5/ijkmediaplayer-armv5.iml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer-armv5/jni/Android.mk b/android/ijkmediaplayer-armv5/jni/Android.mk
deleted file mode 120000
index fe0a0ae4ba..0000000000
--- a/android/ijkmediaplayer-armv5/jni/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-../../ijkmediaplayer/jni/Android.mk
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/jni/ffmpeg b/android/ijkmediaplayer-armv5/jni/ffmpeg
deleted file mode 120000
index d4ccfb5c15..0000000000
--- a/android/ijkmediaplayer-armv5/jni/ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-../../ijkmediaplayer/jni/ffmpeg
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/jni/ijkmedia b/android/ijkmediaplayer-armv5/jni/ijkmedia
deleted file mode 120000
index 5bb840c589..0000000000
--- a/android/ijkmediaplayer-armv5/jni/ijkmedia
+++ /dev/null
@@ -1 +0,0 @@
-../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/build.gradle b/android/ijkmediaplayer-x86/build.gradle
deleted file mode 100644
index 326cb98d01..0000000000
--- a/android/ijkmediaplayer-x86/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- jniLibs.srcDirs = ['libs']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-}
-apply from: rootProject.file('gradle/compile-ijkplayer.gradle')
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/build.xml b/android/ijkmediaplayer-x86/build.xml
deleted file mode 100644
index 770e28a732..0000000000
--- a/android/ijkmediaplayer-x86/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer-x86/ijkmediaplayer-x86.iml b/android/ijkmediaplayer-x86/ijkmediaplayer-x86.iml
deleted file mode 100644
index d06f2467fd..0000000000
--- a/android/ijkmediaplayer-x86/ijkmediaplayer-x86.iml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer-x86/jni/Android.mk b/android/ijkmediaplayer-x86/jni/Android.mk
deleted file mode 120000
index fe0a0ae4ba..0000000000
--- a/android/ijkmediaplayer-x86/jni/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-../../ijkmediaplayer/jni/Android.mk
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/jni/ffmpeg b/android/ijkmediaplayer-x86/jni/ffmpeg
deleted file mode 120000
index d4ccfb5c15..0000000000
--- a/android/ijkmediaplayer-x86/jni/ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-../../ijkmediaplayer/jni/ffmpeg
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/jni/ijkmedia b/android/ijkmediaplayer-x86/jni/ijkmedia
deleted file mode 120000
index 5bb840c589..0000000000
--- a/android/ijkmediaplayer-x86/jni/ijkmedia
+++ /dev/null
@@ -1 +0,0 @@
-../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer/.cproject.bak b/android/ijkmediaplayer/.cproject.bak
deleted file mode 100644
index 414b29da8b..0000000000
--- a/android/ijkmediaplayer/.cproject.bak
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer/.gitignore b/android/ijkmediaplayer/.gitignore
deleted file mode 100644
index f36ca87867..0000000000
--- a/android/ijkmediaplayer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.cproject
diff --git a/android/ijkmediaplayer/.project b/android/ijkmediaplayer/.project
deleted file mode 100644
index 75b7cea01c..0000000000
--- a/android/ijkmediaplayer/.project
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
- ijkmediaplayer
-
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
-
-
- ?children?
- ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||
-
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.buildArguments
-
-
-
- org.eclipse.cdt.make.core.buildCommand
- ndk-build
-
-
- org.eclipse.cdt.make.core.cleanBuildTarget
- clean
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.activeConfigSettings
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
- full,incremental,
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.core.ccnature
- org.eclipse.cdt.managedbuilder.core.managedBuildNature
- org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
-
-
diff --git a/android/ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs b/android/ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index 77386c23cb..0000000000
--- a/android/ijkmediaplayer/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,67 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
diff --git a/android/ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs b/android/ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index adc7bf08c4..0000000000
--- a/android/ijkmediaplayer/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null
@@ -1,168 +0,0 @@
-eclipse.preferences.version=1
-environment/project/com.android.toolchain.gcc.1255826610/ANDROID_NDK/delimiter=\:
-environment/project/com.android.toolchain.gcc.1255826610/ANDROID_NDK/operation=replace
-environment/project/com.android.toolchain.gcc.1255826610/ANDROID_NDK/value=/opt/android/android-ndk
-environment/project/com.android.toolchain.gcc.1255826610/append=true
-environment/project/com.android.toolchain.gcc.1255826610/appendContributed=true
-org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.cdt.core.formatter.alignment_for_assignment=16
-org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=0
-org.eclipse.cdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.cdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=34
-org.eclipse.cdt.core.formatter.alignment_for_conditional_expression_chain=18
-org.eclipse.cdt.core.formatter.alignment_for_constructor_initializer_list=0
-org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
-org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=48
-org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
-org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.cdt.core.formatter.alignment_for_member_access=0
-org.eclipse.cdt.core.formatter.alignment_for_overloaded_left_shift_chain=16
-org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.cdt.core.formatter.comment.min_distance_between_code_and_line_comment=1
-org.eclipse.cdt.core.formatter.comment.never_indent_line_comments_on_first_column=true
-org.eclipse.cdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
-org.eclipse.cdt.core.formatter.compact_else_if=true
-org.eclipse.cdt.core.formatter.continuation_indentation=1
-org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false
-org.eclipse.cdt.core.formatter.indent_access_specifier_extra_spaces=0
-org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
-org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=false
-org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false
-org.eclipse.cdt.core.formatter.indent_empty_lines=false
-org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.cdt.core.formatter.indentation.size=4
-org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_colon_in_constructor_initializer_list=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.join_wrapped_lines=false
-org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.cdt.core.formatter.lineSplit=800
-org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.cdt.core.formatter.tabulation.char=space
-org.eclipse.cdt.core.formatter.tabulation.size=4
-org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/android/ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs b/android/ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs
deleted file mode 100644
index 59a7252010..0000000000
--- a/android/ijkmediaplayer/.settings/org.eclipse.cdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-formatter_profile=_K&R my
-formatter_settings_version=1
diff --git a/android/ijkmediaplayer/.settings/org.eclipse.core.resources.prefs b/android/ijkmediaplayer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203..0000000000
--- a/android/ijkmediaplayer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/android/ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs b/android/ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a..0000000000
--- a/android/ijkmediaplayer/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/android/ijkmediaplayer/build.gradle b/android/ijkmediaplayer/build.gradle
deleted file mode 100644
index 090ba42e60..0000000000
--- a/android/ijkmediaplayer/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- jniLibs.srcDirs = ['libs']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-}
-apply from: rootProject.file('gradle/compile-ijkplayer.gradle')
\ No newline at end of file
diff --git a/android/ijkmediaplayer/build.xml b/android/ijkmediaplayer/build.xml
deleted file mode 100644
index 4f4f9281e5..0000000000
--- a/android/ijkmediaplayer/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer/ijkmediaplayer.iml b/android/ijkmediaplayer/ijkmediaplayer.iml
deleted file mode 100644
index 9d49db9e35..0000000000
--- a/android/ijkmediaplayer/ijkmediaplayer.iml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediaplayer/jni/ffmpeg/include b/android/ijkmediaplayer/jni/ffmpeg/include
deleted file mode 120000
index 40842426c5..0000000000
--- a/android/ijkmediaplayer/jni/ffmpeg/include
+++ /dev/null
@@ -1 +0,0 @@
-../../../build/ffmpeg-armv7a/output/include
\ No newline at end of file
diff --git a/android/ijkmediaplayer/jni/ijkmedia b/android/ijkmediaplayer/jni/ijkmedia
deleted file mode 120000
index 5bb840c589..0000000000
--- a/android/ijkmediaplayer/jni/ijkmedia
+++ /dev/null
@@ -1 +0,0 @@
-../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer/proguard-project.txt b/android/ijkmediaplayer/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/android/ijkmediaplayer/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/android/ijkmediaplayer/res/.gitignore b/android/ijkmediaplayer/res/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/android/ijkmediawidget/.classpath b/android/ijkmediawidget/.classpath
deleted file mode 100644
index e0aae09a03..0000000000
--- a/android/ijkmediawidget/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediawidget/.settings/org.eclipse.core.resources.prefs b/android/ijkmediawidget/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203..0000000000
--- a/android/ijkmediawidget/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/android/ijkmediawidget/.settings/org.eclipse.core.runtime.prefs b/android/ijkmediawidget/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a..0000000000
--- a/android/ijkmediawidget/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/android/ijkmediawidget/build.gradle b/android/ijkmediawidget/build.gradle
deleted file mode 100644
index b82b06853e..0000000000
--- a/android/ijkmediawidget/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-apply plugin: 'com.android.library'
-
-dependencies {
- compile fileTree(dir: 'libs', include: '*.jar')
- compile project(':ijkmediaplayer')
-}
-
-android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- jniLibs.srcDirs = ['libs']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-
- lintOptions{
- abortOnError false
- }
-}
diff --git a/android/ijkmediawidget/ijkmediawidget.iml b/android/ijkmediawidget/ijkmediawidget.iml
deleted file mode 100644
index 69f27bb9be..0000000000
--- a/android/ijkmediawidget/ijkmediawidget.iml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/ijkmediawidget/proguard-project.txt b/android/ijkmediawidget/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/android/ijkmediawidget/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/android/ijkmediawidget/res/drawable-hdpi/ic_launcher.png b/android/ijkmediawidget/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index c6ba88c4fa..0000000000
Binary files a/android/ijkmediawidget/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/ijkmediawidget/res/drawable-mdpi/ic_launcher.png b/android/ijkmediawidget/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa4..0000000000
Binary files a/android/ijkmediawidget/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/ic_launcher.png b/android/ijkmediawidget/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5add9b78db..0000000000
Binary files a/android/ijkmediawidget/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/ijkplayer/.gitignore b/android/ijkplayer/.gitignore
new file mode 100644
index 0000000000..9c4de5825b
--- /dev/null
+++ b/android/ijkplayer/.gitignore
@@ -0,0 +1,7 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle
new file mode 100644
index 0000000000..a098695daa
--- /dev/null
+++ b/android/ijkplayer/build.gradle
@@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.2.3'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+ext {
+ compileSdkVersion = 22
+ buildToolsVersion = "22.0.1"
+}
\ No newline at end of file
diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties
new file mode 100644
index 0000000000..b8dd6327ef
--- /dev/null
+++ b/android/ijkplayer/gradle.properties
@@ -0,0 +1,33 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+VERSION_NAME=0.2.4.3
+VERSION_CODE=204003
+GROUP=tv.danmaku.ijk.media
+
+POM_DESCRIPTION=Video player based on FFmpeg n2.7
+POM_URL=https://github.com/Bilibili/ijkplayer
+POM_SCM_URL=https://github.com/Bilibili/ijkplayer
+POM_SCM_CONNECTION=git@github.com:Bilibili/ijkplayer.git
+POM_SCM_DEV_CONNECTION=git@github.com:Bilibili/ijkplayer.git
+POM_LICENCE_NAME=LGPLv2.1 or later
+POM_LICENCE_URL=https://www.gnu.org/licenses/lgpl-2.1.html
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=bbcallen
+POM_DEVELOPER_NAME=Zhang Rui
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/ijkplayer/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.jar
rename to android/ijkplayer/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/ijkplayer/gradle/wrapper/gradle-wrapper.properties
similarity index 87%
rename from android/gradle/wrapper/gradle-wrapper.properties
rename to android/ijkplayer/gradle/wrapper/gradle-wrapper.properties
index 73d6c3ef44..0c71e760dc 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/ijkplayer/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Dec 14 23:08:14 CST 2014
+#Wed Apr 10 15:27:10 PDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/android/gradlew b/android/ijkplayer/gradlew
similarity index 100%
rename from android/gradlew
rename to android/ijkplayer/gradlew
diff --git a/android/gradlew.bat b/android/ijkplayer/gradlew.bat
similarity index 100%
rename from android/gradlew.bat
rename to android/ijkplayer/gradlew.bat
diff --git a/android/ijkplayer/player-arm64/.gitignore b/android/ijkplayer/player-arm64/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/android/ijkplayer/player-arm64/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/ijkplayer/player-arm64/build.gradle b/android/ijkplayer/player-arm64/build.gradle
new file mode 100644
index 0000000000..33dee32684
--- /dev/null
+++ b/android/ijkplayer/player-arm64/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+ // http://tools.android.com/tech-docs/new-build-system/tips
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 22
+ versionCode 204000
+ versionName "0.2.4"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ sourceSets.main {
+ jniLibs.srcDirs 'src/main/libs'
+ jni.srcDirs = [] // This prevents the auto generation of Android.mk
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+apply from: '../tools/gradle-mvn-push.gradle'
\ No newline at end of file
diff --git a/android/ijkplayer/player-arm64/gradle.properties b/android/ijkplayer/player-arm64/gradle.properties
new file mode 100644
index 0000000000..b326214f6e
--- /dev/null
+++ b/android/ijkplayer/player-arm64/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ijkplayer-arm64
+POM_ARTIFACT_ID=ijkplayer-arm64
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/android/ijkplayer/player-arm64/proguard-rules.pro b/android/ijkplayer/player-arm64/proguard-rules.pro
new file mode 100644
index 0000000000..6b7163b9df
--- /dev/null
+++ b/android/ijkplayer/player-arm64/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /opt/android/ADK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
\ No newline at end of file
diff --git a/android/ijkplayer/player-arm64/src/androidTest/java/tv/danmaku/ijk/media/player_arm64/ApplicationTest.java b/android/ijkplayer/player-arm64/src/androidTest/java/tv/danmaku/ijk/media/player_arm64/ApplicationTest.java
new file mode 100644
index 0000000000..0af5ecb295
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/androidTest/java/tv/danmaku/ijk/media/player_arm64/ApplicationTest.java
@@ -0,0 +1,13 @@
+package tv.danmaku.ijk.media.player_arm64;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/.classpath b/android/ijkplayer/player-arm64/src/main/.classpath
similarity index 91%
rename from android/ijkmediaplayer-armv5/.classpath
rename to android/ijkplayer/player-arm64/src/main/.classpath
index 51769745b2..7bc604bfa8 100644
--- a/android/ijkmediaplayer-armv5/.classpath
+++ b/android/ijkplayer/player-arm64/src/main/.classpath
@@ -3,6 +3,7 @@
+
diff --git a/android/ijkmediaplayer-x86/.project b/android/ijkplayer/player-arm64/src/main/.project
similarity index 95%
rename from android/ijkmediaplayer-x86/.project
rename to android/ijkplayer/player-arm64/src/main/.project
index 858b19c88f..ee31f5ced9 100644
--- a/android/ijkmediaplayer-x86/.project
+++ b/android/ijkplayer/player-arm64/src/main/.project
@@ -1,6 +1,6 @@
- ijkmediaplayer-x86
+ ijkplayer-arm64
diff --git a/android/ijkplayer/player-arm64/src/main/.settings/org.eclipse.jdt.core.prefs b/android/ijkplayer/player-arm64/src/main/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/ijkplayer/player-arm64/src/main/AndroidManifest.xml b/android/ijkplayer/player-arm64/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..e2d409fbc6
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/android/ijkplayer/player-arm64/src/main/java/tv/danmaku/ijk/media/player_arm64/Pragma.java b/android/ijkplayer/player-arm64/src/main/java/tv/danmaku/ijk/media/player_arm64/Pragma.java
new file mode 100644
index 0000000000..368d0fedfc
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/java/tv/danmaku/ijk/media/player_arm64/Pragma.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 Zhang Rui
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tv.danmaku.ijk.media.player_arm64;
+
+public class Pragma {
+
+}
diff --git a/android/ijkplayer/player-arm64/src/main/jni/Android.mk b/android/ijkplayer/player-arm64/src/main/jni/Android.mk
new file mode 120000
index 0000000000..ce5ae04c28
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/jni/Android.mk
@@ -0,0 +1 @@
+../../../../player-armv7a/src/main/jni/Android.mk
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/jni/Application.mk b/android/ijkplayer/player-arm64/src/main/jni/Application.mk
similarity index 100%
rename from android/ijkmediaplayer-arm64-v8a/jni/Application.mk
rename to android/ijkplayer/player-arm64/src/main/jni/Application.mk
diff --git a/android/ijkplayer/player-arm64/src/main/jni/ffmpeg b/android/ijkplayer/player-arm64/src/main/jni/ffmpeg
new file mode 120000
index 0000000000..98ea687e16
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/jni/ffmpeg
@@ -0,0 +1 @@
+../../../../player-armv7a/src/main/jni/ffmpeg
\ No newline at end of file
diff --git a/android/ijkplayer/player-arm64/src/main/jni/ijkmedia b/android/ijkplayer/player-arm64/src/main/jni/ijkmedia
new file mode 120000
index 0000000000..f61992095f
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/jni/ijkmedia
@@ -0,0 +1 @@
+../../../../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/project.properties b/android/ijkplayer/player-arm64/src/main/project.properties
similarity index 100%
rename from android/ijkmediaplayer-armv5/project.properties
rename to android/ijkplayer/player-arm64/src/main/project.properties
diff --git a/android/ijkplayer/player-arm64/src/main/res/values/strings.xml b/android/ijkplayer/player-arm64/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..7356db3545
--- /dev/null
+++ b/android/ijkplayer/player-arm64/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/ijkplayer/player-armv5/.gitignore b/android/ijkplayer/player-armv5/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/android/ijkplayer/player-armv5/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/ijkplayer/player-armv5/build.gradle b/android/ijkplayer/player-armv5/build.gradle
new file mode 100644
index 0000000000..57a114d6c0
--- /dev/null
+++ b/android/ijkplayer/player-armv5/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+ // http://tools.android.com/tech-docs/new-build-system/tips
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 22
+ versionCode 204000
+ versionName "0.2.4"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ sourceSets.main {
+ jniLibs.srcDirs 'src/main/libs'
+ jni.srcDirs = [] // This prevents the auto generation of Android.mk
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+apply from: '../tools/gradle-mvn-push.gradle'
diff --git a/android/ijkplayer/player-armv5/gradle.properties b/android/ijkplayer/player-armv5/gradle.properties
new file mode 100644
index 0000000000..3138409102
--- /dev/null
+++ b/android/ijkplayer/player-armv5/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ijkplayer-armv5
+POM_ARTIFACT_ID=ijkplayer-armv5
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/proguard-project.txt b/android/ijkplayer/player-armv5/proguard-rules.pro
similarity index 62%
rename from android/ijkmediaplayer-arm64-v8a/proguard-project.txt
rename to android/ijkplayer/player-armv5/proguard-rules.pro
index f2fe1559a2..034485dfaa 100644
--- a/android/ijkmediaplayer-arm64-v8a/proguard-project.txt
+++ b/android/ijkplayer/player-armv5/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /opt/android/ADK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/android/ijkplayer/player-armv5/src/androidTest/java/tv/danmaku/ijk/media/player_armv5/ApplicationTest.java b/android/ijkplayer/player-armv5/src/androidTest/java/tv/danmaku/ijk/media/player_armv5/ApplicationTest.java
new file mode 100644
index 0000000000..cb56b96a6e
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/androidTest/java/tv/danmaku/ijk/media/player_armv5/ApplicationTest.java
@@ -0,0 +1,13 @@
+package tv.danmaku.ijk.media.player_armv5;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/android/ijkmediaplayer/.classpath b/android/ijkplayer/player-armv5/src/main/.classpath
similarity index 91%
rename from android/ijkmediaplayer/.classpath
rename to android/ijkplayer/player-armv5/src/main/.classpath
index 51769745b2..7bc604bfa8 100644
--- a/android/ijkmediaplayer/.classpath
+++ b/android/ijkplayer/player-armv5/src/main/.classpath
@@ -3,6 +3,7 @@
+
diff --git a/android/ijkmediaplayer-armv5/.project b/android/ijkplayer/player-armv5/src/main/.project
similarity index 95%
rename from android/ijkmediaplayer-armv5/.project
rename to android/ijkplayer/player-armv5/src/main/.project
index a95a4c8d8f..d29dd480f9 100644
--- a/android/ijkmediaplayer-armv5/.project
+++ b/android/ijkplayer/player-armv5/src/main/.project
@@ -1,6 +1,6 @@
- ijkmediaplayer-armv5
+ ijkplayer-armv5
diff --git a/android/ijkplayer/player-armv5/src/main/.settings/org.eclipse.jdt.core.prefs b/android/ijkplayer/player-armv5/src/main/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/main/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/ijkmediaplayer-armv5/AndroidManifest.xml b/android/ijkplayer/player-armv5/src/main/AndroidManifest.xml
similarity index 72%
rename from android/ijkmediaplayer-armv5/AndroidManifest.xml
rename to android/ijkplayer/player-armv5/src/main/AndroidManifest.xml
index 1924c19373..5d35eadf2a 100644
--- a/android/ijkmediaplayer-armv5/AndroidManifest.xml
+++ b/android/ijkplayer/player-armv5/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="tv.danmaku.ijk.media.player_armv5" >
diff --git a/android/ijkplayer/player-armv5/src/main/java/tv/danmaku/ijk/media/player_armv5/Pragma.java b/android/ijkplayer/player-armv5/src/main/java/tv/danmaku/ijk/media/player_armv5/Pragma.java
new file mode 100644
index 0000000000..e239e8c634
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/main/java/tv/danmaku/ijk/media/player_armv5/Pragma.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 Zhang Rui
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tv.danmaku.ijk.media.player_armv5;
+
+public class Pragma {
+
+}
diff --git a/android/ijkplayer/player-armv5/src/main/jni/Android.mk b/android/ijkplayer/player-armv5/src/main/jni/Android.mk
new file mode 120000
index 0000000000..ce5ae04c28
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/main/jni/Android.mk
@@ -0,0 +1 @@
+../../../../player-armv7a/src/main/jni/Android.mk
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/jni/Application.mk b/android/ijkplayer/player-armv5/src/main/jni/Application.mk
similarity index 97%
rename from android/ijkmediaplayer-armv5/jni/Application.mk
rename to android/ijkplayer/player-armv5/src/main/jni/Application.mk
index baa97c216a..ba74bd88a8 100644
--- a/android/ijkmediaplayer-armv5/jni/Application.mk
+++ b/android/ijkplayer/player-armv5/src/main/jni/Application.mk
@@ -21,7 +21,6 @@ APP_PLATFORM := android-9
APP_ABI := armeabi
NDK_TOOLCHAIN_VERSION=4.8
APP_PIE := false
-APP_STL := stlport_shared
APP_CFLAGS := -O3 -Wall -pipe \
-ffast-math \
diff --git a/android/ijkplayer/player-armv5/src/main/jni/ffmpeg b/android/ijkplayer/player-armv5/src/main/jni/ffmpeg
new file mode 120000
index 0000000000..98ea687e16
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/main/jni/ffmpeg
@@ -0,0 +1 @@
+../../../../player-armv7a/src/main/jni/ffmpeg
\ No newline at end of file
diff --git a/android/ijkplayer/player-armv5/src/main/jni/ijkmedia b/android/ijkplayer/player-armv5/src/main/jni/ijkmedia
new file mode 120000
index 0000000000..f61992095f
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/main/jni/ijkmedia
@@ -0,0 +1 @@
+../../../../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/project.properties b/android/ijkplayer/player-armv5/src/main/project.properties
similarity index 100%
rename from android/ijkmediaplayer-x86/project.properties
rename to android/ijkplayer/player-armv5/src/main/project.properties
diff --git a/android/ijkplayer/player-armv5/src/main/res/values/strings.xml b/android/ijkplayer/player-armv5/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..7356db3545
--- /dev/null
+++ b/android/ijkplayer/player-armv5/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/ijkplayer/player-armv7a/.gitignore b/android/ijkplayer/player-armv7a/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/ijkplayer/player-armv7a/build.gradle b/android/ijkplayer/player-armv7a/build.gradle
new file mode 100644
index 0000000000..c757351100
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+ // http://tools.android.com/tech-docs/new-build-system/tips
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 22
+ versionCode 204000
+ versionName "0.2.4"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ sourceSets.main {
+ jniLibs.srcDirs 'src/main/libs'
+ jni.srcDirs = [] // This prevents the auto generation of Android.mk
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+}
+
+apply from: '../tools/gradle-mvn-push.gradle'
\ No newline at end of file
diff --git a/android/ijkplayer/player-armv7a/gradle.properties b/android/ijkplayer/player-armv7a/gradle.properties
new file mode 100644
index 0000000000..934696c731
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ijkplayer-armv7a
+POM_ARTIFACT_ID=ijkplayer-armv7a
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/proguard-project.txt b/android/ijkplayer/player-armv7a/proguard-rules.pro
similarity index 62%
rename from android/ijkmediaplayer-x86/proguard-project.txt
rename to android/ijkplayer/player-armv7a/proguard-rules.pro
index f2fe1559a2..034485dfaa 100644
--- a/android/ijkmediaplayer-x86/proguard-project.txt
+++ b/android/ijkplayer/player-armv7a/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /opt/android/ADK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/android/ijkplayer/player-armv7a/src/androidTest/java/tv/danmaku/ijk/media/player_armv7a/ApplicationTest.java b/android/ijkplayer/player-armv7a/src/androidTest/java/tv/danmaku/ijk/media/player_armv7a/ApplicationTest.java
new file mode 100644
index 0000000000..5a54d72f37
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/src/androidTest/java/tv/danmaku/ijk/media/player_armv7a/ApplicationTest.java
@@ -0,0 +1,13 @@
+package tv.danmaku.ijk.media.player_armv7a;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/.classpath b/android/ijkplayer/player-armv7a/src/main/.classpath
similarity index 91%
rename from android/ijkmediaplayer-x86/.classpath
rename to android/ijkplayer/player-armv7a/src/main/.classpath
index 51769745b2..7bc604bfa8 100644
--- a/android/ijkmediaplayer-x86/.classpath
+++ b/android/ijkplayer/player-armv7a/src/main/.classpath
@@ -3,6 +3,7 @@
+
diff --git a/android/ijkplayer/player-armv7a/src/main/.project b/android/ijkplayer/player-armv7a/src/main/.project
new file mode 100644
index 0000000000..18e77880d3
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/src/main/.project
@@ -0,0 +1,33 @@
+
+
+ ijkplayer-armv7a
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/android/ijkplayer/player-armv7a/src/main/.settings/org.eclipse.jdt.core.prefs b/android/ijkplayer/player-armv7a/src/main/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/src/main/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/ijkmediaplayer-x86/AndroidManifest.xml b/android/ijkplayer/player-armv7a/src/main/AndroidManifest.xml
similarity index 72%
rename from android/ijkmediaplayer-x86/AndroidManifest.xml
rename to android/ijkplayer/player-armv7a/src/main/AndroidManifest.xml
index 90a68312de..f3727da39c 100644
--- a/android/ijkmediaplayer-x86/AndroidManifest.xml
+++ b/android/ijkplayer/player-armv7a/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="tv.danmaku.ijk.media.player_armv7a" >
diff --git a/android/ijkplayer/player-armv7a/src/main/java/tv/danmaku/ijk/media/player_armv7a/Pragma.java b/android/ijkplayer/player-armv7a/src/main/java/tv/danmaku/ijk/media/player_armv7a/Pragma.java
new file mode 100644
index 0000000000..f2b4c5fa67
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/src/main/java/tv/danmaku/ijk/media/player_armv7a/Pragma.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 Zhang Rui
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tv.danmaku.ijk.media.player_armv7a;
+
+public class Pragma {
+
+}
diff --git a/android/ijkmediaplayer/jni/Android.mk b/android/ijkplayer/player-armv7a/src/main/jni/Android.mk
similarity index 76%
rename from android/ijkmediaplayer/jni/Android.mk
rename to android/ijkplayer/player-armv7a/src/main/jni/Android.mk
index b7d0c4cbf0..ed20d6d04c 100644
--- a/android/ijkmediaplayer/jni/Android.mk
+++ b/android/ijkplayer/player-armv7a/src/main/jni/Android.mk
@@ -20,22 +20,22 @@ LOCAL_PATH := $(call my-dir)
MY_APP_JNI_ROOT := $(realpath $(LOCAL_PATH))
MY_APP_PRJ_ROOT := $(realpath $(MY_APP_JNI_ROOT)/..)
-MY_APP_ANDROID_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/..)
+MY_APP_ANDROID_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/../../../..)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/build/ffmpeg-armv7a/output)
+MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/contrib/build/ffmpeg-armv7a/output)
MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
endif
ifeq ($(TARGET_ARCH_ABI),armeabi)
-MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/build/ffmpeg-armv5/output)
+MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/contrib/build/ffmpeg-armv5/output)
MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
endif
ifeq ($(TARGET_ARCH_ABI),x86)
-MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/build/ffmpeg-x86/output)
+MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/contrib/build/ffmpeg-x86/output)
MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
endif
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/build/ffmpeg-arm64-v8a/output)
+MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/contrib/build/ffmpeg-arm64/output)
MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
endif
diff --git a/android/ijkmediaplayer/jni/Application.mk b/android/ijkplayer/player-armv7a/src/main/jni/Application.mk
similarity index 100%
rename from android/ijkmediaplayer/jni/Application.mk
rename to android/ijkplayer/player-armv7a/src/main/jni/Application.mk
diff --git a/android/ijkmediaplayer/jni/ffmpeg/Android.mk b/android/ijkplayer/player-armv7a/src/main/jni/ffmpeg/Android.mk
similarity index 100%
rename from android/ijkmediaplayer/jni/ffmpeg/Android.mk
rename to android/ijkplayer/player-armv7a/src/main/jni/ffmpeg/Android.mk
diff --git a/android/ijkplayer/player-armv7a/src/main/jni/ijkmedia b/android/ijkplayer/player-armv7a/src/main/jni/ijkmedia
new file mode 120000
index 0000000000..f61992095f
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/src/main/jni/ijkmedia
@@ -0,0 +1 @@
+../../../../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediaplayer/project.properties b/android/ijkplayer/player-armv7a/src/main/project.properties
similarity index 100%
rename from android/ijkmediaplayer/project.properties
rename to android/ijkplayer/player-armv7a/src/main/project.properties
diff --git a/android/ijkplayer/player-armv7a/src/main/res/values/strings.xml b/android/ijkplayer/player-armv7a/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..7356db3545
--- /dev/null
+++ b/android/ijkplayer/player-armv7a/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/ijkplayer/player-java/.gitignore b/android/ijkplayer/player-java/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/android/ijkplayer/player-java/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/ijkplayer/player-java/build.gradle b/android/ijkplayer/player-java/build.gradle
new file mode 100644
index 0000000000..c999c6ae9d
--- /dev/null
+++ b/android/ijkplayer/player-java/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+
+android {
+ // http://tools.android.com/tech-docs/new-build-system/tips
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 22
+ versionCode 204000
+ versionName "0.2.4"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+apply from: '../tools/gradle-mvn-push.gradle'
\ No newline at end of file
diff --git a/android/ijkplayer/player-java/gradle.properties b/android/ijkplayer/player-java/gradle.properties
new file mode 100644
index 0000000000..a6b3c5cdac
--- /dev/null
+++ b/android/ijkplayer/player-java/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ijkplayer-java
+POM_ARTIFACT_ID=ijkplayer-java
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/android/ijkmediademo/proguard-project.txt b/android/ijkplayer/player-java/proguard-rules.pro
similarity index 62%
rename from android/ijkmediademo/proguard-project.txt
rename to android/ijkplayer/player-java/proguard-rules.pro
index f2fe1559a2..034485dfaa 100644
--- a/android/ijkmediademo/proguard-project.txt
+++ b/android/ijkplayer/player-java/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /opt/android/ADK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/android/ijkplayer/player-java/src/androidTest/java/tv/danmaku/ijk/media/player/ApplicationTest.java b/android/ijkplayer/player-java/src/androidTest/java/tv/danmaku/ijk/media/player/ApplicationTest.java
new file mode 100644
index 0000000000..60d1d7329a
--- /dev/null
+++ b/android/ijkplayer/player-java/src/androidTest/java/tv/danmaku/ijk/media/player/ApplicationTest.java
@@ -0,0 +1,13 @@
+package tv.danmaku.ijk.media.player;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/android/ijkmediaplayer-arm64-v8a/.classpath b/android/ijkplayer/player-java/src/main/.classpath
similarity index 91%
rename from android/ijkmediaplayer-arm64-v8a/.classpath
rename to android/ijkplayer/player-java/src/main/.classpath
index 51769745b2..b3caa8c22e 100644
--- a/android/ijkmediaplayer-arm64-v8a/.classpath
+++ b/android/ijkplayer/player-java/src/main/.classpath
@@ -1,5 +1,6 @@
+
diff --git a/android/ijkmediawidget/.project b/android/ijkplayer/player-java/src/main/.project
similarity index 96%
rename from android/ijkmediawidget/.project
rename to android/ijkplayer/player-java/src/main/.project
index 9d9f3b4894..31663eb26b 100644
--- a/android/ijkmediawidget/.project
+++ b/android/ijkplayer/player-java/src/main/.project
@@ -1,6 +1,6 @@
- ijkmediawidget
+ ijkplayer-java
diff --git a/android/ijkplayer/player-java/src/main/.settings/org.eclipse.jdt.core.prefs b/android/ijkplayer/player-java/src/main/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/ijkplayer/player-java/src/main/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/ijkmediaplayer/AndroidManifest.xml b/android/ijkplayer/player-java/src/main/AndroidManifest.xml
similarity index 75%
rename from android/ijkmediaplayer/AndroidManifest.xml
rename to android/ijkplayer/player-java/src/main/AndroidManifest.xml
index b87c206c27..c87fe47051 100644
--- a/android/ijkmediaplayer/AndroidManifest.xml
+++ b/android/ijkplayer/player-java/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="tv.danmaku.ijk.media.player" >
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
similarity index 99%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
index ed41536f71..d736e0156a 100644
--- a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
+++ b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
@@ -21,6 +21,7 @@
import java.lang.ref.WeakReference;
import tv.danmaku.ijk.media.player.pragma.DebugLog;
+
import android.content.Context;
import android.media.AudioManager;
import android.media.MediaPlayer;
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/BaseMediaPlayer.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/BaseMediaPlayer.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/BaseMediaPlayer.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/BaseMediaPlayer.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IMediaPlayer.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IMediaPlayer.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkLibLoader.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkLibLoader.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaMeta.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaMeta.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
similarity index 98%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
index ffaf16bda9..cdfbfa6e31 100644
--- a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
+++ b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
@@ -17,7 +17,6 @@
package tv.danmaku.ijk.media.player;
-import java.io.FileDescriptor;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -136,7 +135,8 @@ public IjkMediaPlayer() {
/**
* do not loadLibaray
- * @param reserved
+ * @param libLoader
+ * custom library loader, can be null.
*/
public IjkMediaPlayer(IjkLibLoader libLoader) {
initPlayer(libLoader);
@@ -239,10 +239,7 @@ public void setSurface(Surface surface) {
* application. This implies that the pathname should be an
* absolute path (as any other process runs with unspecified
* current working directory), and that the pathname should
- * reference a world-readable file. As an alternative, the
- * application could first open the file for reading, and then
- * use the file descriptor form
- * {@link #setDataSource(FileDescriptor)}.
+ * reference a world-readable file.
*/
@Override
public void setDataSource(String path) throws IOException,
@@ -494,8 +491,8 @@ public void setOverlayFormat(int chromaFourCC) {
/**
* @param frameDrop
* =0 do not drop any frame
- * <0 drop as many frames as possible
- * >0 display 1 frame per `frameDrop` continuous dropped frames,
+ * +n drop as many frames as possible
+ * -1 display 1 frame per `frameDrop` continuous dropped frames,
*/
public void setFrameDrop(int frameDrop) {
_setFrameDrop(frameDrop);
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/MediaInfo.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/MediaInfo.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/SimpleMediaPlayer.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/SimpleMediaPlayer.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/SimpleMediaPlayer.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/SimpleMediaPlayer.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/annotations/CalledByNative.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/option/AvFormatOption.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/option/AvFormatOption.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/option/AvFormatOption.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/option/AvFormatOption.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/option/AvFourCC.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/option/AvFourCC.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/option/AvFourCC.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/option/AvFourCC.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/option/format/AvFormatOption_HttpDetectRangeSupport.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/option/format/AvFormatOption_HttpDetectRangeSupport.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/option/format/AvFormatOption_HttpDetectRangeSupport.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/option/format/AvFormatOption_HttpDetectRangeSupport.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/pragma/DebugLog.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/pragma/DebugLog.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/pragma/Pragma.java b/android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java
similarity index 100%
rename from android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/pragma/Pragma.java
rename to android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java
diff --git a/android/ijkmediaplayer-arm64-v8a/project.properties b/android/ijkplayer/player-java/src/main/project.properties
similarity index 96%
rename from android/ijkmediaplayer-arm64-v8a/project.properties
rename to android/ijkplayer/player-java/src/main/project.properties
index 93c8c3c08d..362a0a3082 100644
--- a/android/ijkmediaplayer-arm64-v8a/project.properties
+++ b/android/ijkplayer/player-java/src/main/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-21
+target=android-22
android.library=true
diff --git a/android/ijkplayer/player-java/src/main/res/values/strings.xml b/android/ijkplayer/player-java/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..7356db3545
--- /dev/null
+++ b/android/ijkplayer/player-java/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/ijkplayer/player-x86/.gitignore b/android/ijkplayer/player-x86/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/android/ijkplayer/player-x86/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/ijkplayer/player-x86/build.gradle b/android/ijkplayer/player-x86/build.gradle
new file mode 100644
index 0000000000..33dee32684
--- /dev/null
+++ b/android/ijkplayer/player-x86/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+ // http://tools.android.com/tech-docs/new-build-system/tips
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 22
+ versionCode 204000
+ versionName "0.2.4"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ sourceSets.main {
+ jniLibs.srcDirs 'src/main/libs'
+ jni.srcDirs = [] // This prevents the auto generation of Android.mk
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+apply from: '../tools/gradle-mvn-push.gradle'
\ No newline at end of file
diff --git a/android/ijkplayer/player-x86/gradle.properties b/android/ijkplayer/player-x86/gradle.properties
new file mode 100644
index 0000000000..3e1821a4d4
--- /dev/null
+++ b/android/ijkplayer/player-x86/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ijkplayer-x86
+POM_ARTIFACT_ID=ijkplayer-x86
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/android/ijkmediaplayer-armv5/proguard-project.txt b/android/ijkplayer/player-x86/proguard-rules.pro
similarity index 62%
rename from android/ijkmediaplayer-armv5/proguard-project.txt
rename to android/ijkplayer/player-x86/proguard-rules.pro
index f2fe1559a2..034485dfaa 100644
--- a/android/ijkmediaplayer-armv5/proguard-project.txt
+++ b/android/ijkplayer/player-x86/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /opt/android/ADK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/android/ijkplayer/player-x86/src/androidTest/java/tv/danmaku/ijk/media/ijkplayer/ApplicationTest.java b/android/ijkplayer/player-x86/src/androidTest/java/tv/danmaku/ijk/media/ijkplayer/ApplicationTest.java
new file mode 100644
index 0000000000..960c30ddf8
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/androidTest/java/tv/danmaku/ijk/media/ijkplayer/ApplicationTest.java
@@ -0,0 +1,13 @@
+package tv.danmaku.ijk.media.ijkplayer;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/android/ijkplayer/player-x86/src/main/.classpath b/android/ijkplayer/player-x86/src/main/.classpath
new file mode 100644
index 0000000000..7bc604bfa8
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/.classpath
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/android/ijkmediademo/.project b/android/ijkplayer/player-x86/src/main/.project
similarity index 96%
rename from android/ijkmediademo/.project
rename to android/ijkplayer/player-x86/src/main/.project
index 5f91a190f5..3a120e7321 100644
--- a/android/ijkmediademo/.project
+++ b/android/ijkplayer/player-x86/src/main/.project
@@ -1,6 +1,6 @@
- ijkmediademo
+ ijkplayer-x86
diff --git a/android/ijkplayer/player-x86/src/main/.settings/org.eclipse.jdt.core.prefs b/android/ijkplayer/player-x86/src/main/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/ijkmediawidget/AndroidManifest.xml b/android/ijkplayer/player-x86/src/main/AndroidManifest.xml
similarity index 67%
rename from android/ijkmediawidget/AndroidManifest.xml
rename to android/ijkplayer/player-x86/src/main/AndroidManifest.xml
index bb5e6f18bc..68a12d04a8 100644
--- a/android/ijkmediawidget/AndroidManifest.xml
+++ b/android/ijkplayer/player-x86/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
+ package="tv.danmaku.ijk.media.player_x86">
-
\ No newline at end of file
+
diff --git a/android/ijkplayer/player-x86/src/main/java/tv/danmaku/ijk/media/player_x86/Pragma.java b/android/ijkplayer/player-x86/src/main/java/tv/danmaku/ijk/media/player_x86/Pragma.java
new file mode 100644
index 0000000000..8abb2f958e
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/java/tv/danmaku/ijk/media/player_x86/Pragma.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 Zhang Rui
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tv.danmaku.ijk.media.player_x86;
+
+public class Pragma {
+
+}
diff --git a/android/ijkplayer/player-x86/src/main/jni/Android.mk b/android/ijkplayer/player-x86/src/main/jni/Android.mk
new file mode 120000
index 0000000000..ce5ae04c28
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/jni/Android.mk
@@ -0,0 +1 @@
+../../../../player-armv7a/src/main/jni/Android.mk
\ No newline at end of file
diff --git a/android/ijkmediaplayer-x86/jni/Application.mk b/android/ijkplayer/player-x86/src/main/jni/Application.mk
similarity index 100%
rename from android/ijkmediaplayer-x86/jni/Application.mk
rename to android/ijkplayer/player-x86/src/main/jni/Application.mk
diff --git a/android/ijkplayer/player-x86/src/main/jni/ffmpeg/Android.mk b/android/ijkplayer/player-x86/src/main/jni/ffmpeg/Android.mk
new file mode 100644
index 0000000000..ec33908f53
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/jni/ffmpeg/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ijkffmpeg
+LOCAL_SRC_FILES := $(MY_APP_FFMPEG_OUTPUT_PATH)/libijkffmpeg.so
+include $(PREBUILT_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/android/ijkplayer/player-x86/src/main/jni/ffmpeg/include b/android/ijkplayer/player-x86/src/main/jni/ffmpeg/include
new file mode 120000
index 0000000000..530bcb6b15
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/jni/ffmpeg/include
@@ -0,0 +1 @@
+../../../../../../contrib/build/ffmpeg-x86/output/include/
\ No newline at end of file
diff --git a/android/ijkplayer/player-x86/src/main/jni/ijkmedia b/android/ijkplayer/player-x86/src/main/jni/ijkmedia
new file mode 120000
index 0000000000..f61992095f
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/jni/ijkmedia
@@ -0,0 +1 @@
+../../../../../../ijkmedia
\ No newline at end of file
diff --git a/android/ijkmediawidget/project.properties b/android/ijkplayer/player-x86/src/main/project.properties
similarity index 92%
rename from android/ijkmediawidget/project.properties
rename to android/ijkplayer/player-x86/src/main/project.properties
index d71372a5e8..362a0a3082 100644
--- a/android/ijkmediawidget/project.properties
+++ b/android/ijkplayer/player-x86/src/main/project.properties
@@ -13,4 +13,3 @@
# Project target.
target=android-22
android.library=true
-android.library.reference.1=../ijkmediaplayer
diff --git a/android/ijkplayer/player-x86/src/main/res/values/strings.xml b/android/ijkplayer/player-x86/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..7356db3545
--- /dev/null
+++ b/android/ijkplayer/player-x86/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/ijkplayer/sample/.gitignore b/android/ijkplayer/sample/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/android/ijkplayer/sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/ijkplayer/sample/build.gradle b/android/ijkplayer/sample/build.gradle
new file mode 100644
index 0000000000..20756f5551
--- /dev/null
+++ b/android/ijkplayer/sample/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.application'
+
+android {
+ // http://tools.android.com/tech-docs/new-build-system/tips
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
+
+ defaultConfig {
+ applicationId "tv.danmaku.ijk.media.sample"
+ minSdkVersion 9
+ targetSdkVersion 22
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ compile 'com.android.support:appcompat-v7:22.2.0'
+ compile project(':player-java')
+ compile project(':player-armv7a')
+ compile project(':player-x86')
+ compile project(':player-armv5')
+ compile project(':player-arm64')
+}
\ No newline at end of file
diff --git a/android/ijkplayer/sample/proguard-rules.pro b/android/ijkplayer/sample/proguard-rules.pro
new file mode 100644
index 0000000000..034485dfaa
--- /dev/null
+++ b/android/ijkplayer/sample/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /opt/android/ADK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/android/ijkplayer/sample/src/androidTest/java/tv/danmaku/ijk/media/sample/ApplicationTest.java b/android/ijkplayer/sample/src/androidTest/java/tv/danmaku/ijk/media/sample/ApplicationTest.java
new file mode 100644
index 0000000000..699ac1cf1c
--- /dev/null
+++ b/android/ijkplayer/sample/src/androidTest/java/tv/danmaku/ijk/media/sample/ApplicationTest.java
@@ -0,0 +1,13 @@
+package tv.danmaku.ijk.media.sample;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/android/ijkmediademo/.classpath b/android/ijkplayer/sample/src/main/.classpath
similarity index 53%
rename from android/ijkmediademo/.classpath
rename to android/ijkplayer/sample/src/main/.classpath
index 2810a2f5aa..a5918a07cd 100644
--- a/android/ijkmediademo/.classpath
+++ b/android/ijkplayer/sample/src/main/.classpath
@@ -1,11 +1,15 @@
+
-
-
-
+
+
+
+
+
+
diff --git a/android/ijkplayer/sample/src/main/.project b/android/ijkplayer/sample/src/main/.project
new file mode 100644
index 0000000000..0a083ee655
--- /dev/null
+++ b/android/ijkplayer/sample/src/main/.project
@@ -0,0 +1,33 @@
+
+
+ ijkplayer-sample
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/android/ijkplayer/sample/src/main/.settings/org.eclipse.jdt.core.prefs b/android/ijkplayer/sample/src/main/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b080d2ddc8
--- /dev/null
+++ b/android/ijkplayer/sample/src/main/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/android/ijkmediademo/AndroidManifest.xml b/android/ijkplayer/sample/src/main/AndroidManifest.xml
similarity index 88%
rename from android/ijkmediademo/AndroidManifest.xml
rename to android/ijkplayer/sample/src/main/AndroidManifest.xml
index 3f5b99890d..904a4b5d38 100644
--- a/android/ijkmediademo/AndroidManifest.xml
+++ b/android/ijkplayer/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
+ package="tv.danmaku.ijk.media.sample" >
= Build.VERSION_CODES.ICE_CREAM_SANDWICH){
@@ -303,6 +305,7 @@ public boolean isShowing() {
return mShowing;
}
+ @SuppressLint("InlinedApi")
public void hide() {
if (mAnchor == null)
return;
diff --git a/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/OutlineTextView.java b/android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/OutlineTextView.java
similarity index 100%
rename from android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/OutlineTextView.java
rename to android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/OutlineTextView.java
diff --git a/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/Pragma.java b/android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/Pragma.java
similarity index 100%
rename from android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/Pragma.java
rename to android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/Pragma.java
diff --git a/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/ScreenResolution.java b/android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/ScreenResolution.java
similarity index 100%
rename from android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/ScreenResolution.java
rename to android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/ScreenResolution.java
diff --git a/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java b/android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/VideoView.java
similarity index 99%
rename from android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java
rename to android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/VideoView.java
index 471a22afbb..7da4a8a2c1 100644
--- a/android/ijkmediawidget/src/tv/danmaku/ijk/media/widget/VideoView.java
+++ b/android/ijkplayer/sample/src/main/java/tv/danmaku/ijk/media/widget/VideoView.java
@@ -32,6 +32,8 @@
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
import tv.danmaku.ijk.media.player.option.AvFourCC;
import tv.danmaku.ijk.media.player.option.format.AvFormatOption_HttpDetectRangeSupport;
+import tv.danmaku.ijk.media.sample.R;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
diff --git a/android/ijkmediademo/project.properties b/android/ijkplayer/sample/src/main/project.properties
similarity index 61%
rename from android/ijkmediademo/project.properties
rename to android/ijkplayer/sample/src/main/project.properties
index d3e50537da..672cae7d65 100644
--- a/android/ijkmediademo/project.properties
+++ b/android/ijkplayer/sample/src/main/project.properties
@@ -12,6 +12,9 @@
# Project target.
target=android-22
-android.library.reference.1=../ijkmediawidget
-android.library.reference.2=../ijkmediaplayer
-android.library.reference.3=../contrib/appcompat
+android.library.reference.1=../../../player-arm64/src/main
+android.library.reference.2=../../../player-armv5/src/main
+android.library.reference.3=../../../player-armv7a/src/main
+android.library.reference.4=../../../player-x86/src/main
+android.library.reference.5=../../../player-java/src/main
+android.library.reference.6=../../../../contrib/appcompat
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_bg.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_bg.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_bg.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_bg.png
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause01.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_pause01.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause01.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_pause01.png
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause02.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_pause02.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_pause02.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_pause02.png
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play01.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_play01.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play01.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_play01.png
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play02.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_play02.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_play02.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_play02.png
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar01.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_seekbar01.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar01.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_seekbar01.png
diff --git a/android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar02.png b/android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_seekbar02.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-hdpi/mediacontroller_seekbar02.png
rename to android/ijkplayer/sample/src/main/res/drawable-hdpi/mediacontroller_seekbar02.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_disabled_holo.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_disabled_holo.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_disabled_holo.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_disabled_holo.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_focused_holo.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_focused_holo.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_focused_holo.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_focused_holo.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_normal_holo.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_normal_holo.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_normal_holo.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_normal_holo.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_pressed_holo.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_pressed_holo.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_control_pressed_holo.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_control_pressed_holo.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_primary_holo.9.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_primary_holo.9.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_primary_holo.9.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_primary_holo.9.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_secondary_holo.9.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_secondary_holo.9.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_secondary_holo.9.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_secondary_holo.9.png
diff --git a/android/ijkmediawidget/res/drawable-xhdpi/scrubber_track_holo_dark.9.png b/android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
similarity index 100%
rename from android/ijkmediawidget/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
rename to android/ijkplayer/sample/src/main/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
diff --git a/android/ijkmediawidget/res/drawable/mediacontroller_pause_button.xml b/android/ijkplayer/sample/src/main/res/drawable/mediacontroller_pause_button.xml
similarity index 100%
rename from android/ijkmediawidget/res/drawable/mediacontroller_pause_button.xml
rename to android/ijkplayer/sample/src/main/res/drawable/mediacontroller_pause_button.xml
diff --git a/android/ijkmediawidget/res/drawable/mediacontroller_play_button.xml b/android/ijkplayer/sample/src/main/res/drawable/mediacontroller_play_button.xml
similarity index 100%
rename from android/ijkmediawidget/res/drawable/mediacontroller_play_button.xml
rename to android/ijkplayer/sample/src/main/res/drawable/mediacontroller_play_button.xml
diff --git a/android/ijkmediawidget/res/drawable/scrubber_control_selector_holo.xml b/android/ijkplayer/sample/src/main/res/drawable/scrubber_control_selector_holo.xml
similarity index 100%
rename from android/ijkmediawidget/res/drawable/scrubber_control_selector_holo.xml
rename to android/ijkplayer/sample/src/main/res/drawable/scrubber_control_selector_holo.xml
diff --git a/android/ijkmediawidget/res/drawable/scrubber_progress_horizontal_holo_dark.xml b/android/ijkplayer/sample/src/main/res/drawable/scrubber_progress_horizontal_holo_dark.xml
similarity index 100%
rename from android/ijkmediawidget/res/drawable/scrubber_progress_horizontal_holo_dark.xml
rename to android/ijkplayer/sample/src/main/res/drawable/scrubber_progress_horizontal_holo_dark.xml
diff --git a/android/ijkmediademo/res/layout/activity_file_list.xml b/android/ijkplayer/sample/src/main/res/layout/activity_file_list.xml
similarity index 95%
rename from android/ijkmediademo/res/layout/activity_file_list.xml
rename to android/ijkplayer/sample/src/main/res/layout/activity_file_list.xml
index ed3de123db..343304d042 100644
--- a/android/ijkmediademo/res/layout/activity_file_list.xml
+++ b/android/ijkplayer/sample/src/main/res/layout/activity_file_list.xml
@@ -13,6 +13,7 @@
android:layout_height="wrap_content"
android:id="@+id/fileListView"
android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:choiceMode="singleChoice"/>
diff --git a/android/ijkmediademo/res/layout/activity_player.xml b/android/ijkplayer/sample/src/main/res/layout/activity_player.xml
similarity index 100%
rename from android/ijkmediademo/res/layout/activity_player.xml
rename to android/ijkplayer/sample/src/main/res/layout/activity_player.xml
diff --git a/android/ijkmediawidget/res/layout/mediacontroller.xml b/android/ijkplayer/sample/src/main/res/layout/mediacontroller.xml
similarity index 100%
rename from android/ijkmediawidget/res/layout/mediacontroller.xml
rename to android/ijkplayer/sample/src/main/res/layout/mediacontroller.xml
diff --git a/android/ijkmediademo/res/menu/menu_file_list.xml b/android/ijkplayer/sample/src/main/res/menu/menu_file_list.xml
similarity index 100%
rename from android/ijkmediademo/res/menu/menu_file_list.xml
rename to android/ijkplayer/sample/src/main/res/menu/menu_file_list.xml
diff --git a/android/ijkplayer/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/android/ijkplayer/sample/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..cde69bccce
Binary files /dev/null and b/android/ijkplayer/sample/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/ijkplayer/sample/src/main/res/mipmap-mdpi/ic_launcher.png b/android/ijkplayer/sample/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..c133a0cbd3
Binary files /dev/null and b/android/ijkplayer/sample/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/ijkplayer/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/ijkplayer/sample/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..bfa42f0e7b
Binary files /dev/null and b/android/ijkplayer/sample/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/ijkplayer/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/ijkplayer/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..324e72cdd7
Binary files /dev/null and b/android/ijkplayer/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/ijkmediawidget/res/values-v11/styles.xml b/android/ijkplayer/sample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from android/ijkmediawidget/res/values-v11/styles.xml
rename to android/ijkplayer/sample/src/main/res/values-v11/styles.xml
diff --git a/android/ijkmediawidget/res/values-v14/styles.xml b/android/ijkplayer/sample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from android/ijkmediawidget/res/values-v14/styles.xml
rename to android/ijkplayer/sample/src/main/res/values-v14/styles.xml
diff --git a/android/ijkmediademo/res/values-w820dp/dimens.xml b/android/ijkplayer/sample/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from android/ijkmediademo/res/values-w820dp/dimens.xml
rename to android/ijkplayer/sample/src/main/res/values-w820dp/dimens.xml
diff --git a/android/ijkmediademo/res/values/colors.xml b/android/ijkplayer/sample/src/main/res/values/colors.xml
similarity index 100%
rename from android/ijkmediademo/res/values/colors.xml
rename to android/ijkplayer/sample/src/main/res/values/colors.xml
diff --git a/android/ijkmediademo/res/values/dimens.xml b/android/ijkplayer/sample/src/main/res/values/dimens.xml
similarity index 100%
rename from android/ijkmediademo/res/values/dimens.xml
rename to android/ijkplayer/sample/src/main/res/values/dimens.xml
diff --git a/android/ijkmediawidget/res/values/strings.xml b/android/ijkplayer/sample/src/main/res/values/strings.xml
similarity index 70%
rename from android/ijkmediawidget/res/values/strings.xml
rename to android/ijkplayer/sample/src/main/res/values/strings.xml
index 02d886d540..1a5ebb90f2 100644
--- a/android/ijkmediawidget/res/values/strings.xml
+++ b/android/ijkplayer/sample/src/main/res/values/strings.xml
@@ -1,6 +1,13 @@
+ ijkmediademo
+ Dummy Button
+ DUMMY\nCONTENT
+
+ buffering
+ Sort
+
Vitamio
Initializing decoders…
Cannot play video
@@ -10,4 +17,4 @@
OK
Play/Pause
-
\ No newline at end of file
+
diff --git a/android/ijkmediawidget/res/values/styles.xml b/android/ijkplayer/sample/src/main/res/values/styles.xml
similarity index 67%
rename from android/ijkmediawidget/res/values/styles.xml
rename to android/ijkplayer/sample/src/main/res/values/styles.xml
index 25f8732841..ddf92f1a13 100644
--- a/android/ijkmediawidget/res/values/styles.xml
+++ b/android/ijkplayer/sample/src/main/res/values/styles.xml
@@ -1,7 +1,16 @@
-
+
-
+
+
+
+
+
-
+