Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xiangrong first commit #5210

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xiangrong first commit #5210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions android/ijkplayer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:4.1.1'

classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
Expand All @@ -17,14 +18,15 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}

ext {
compileSdkVersion = 23
compileSdkVersion = 28
buildToolsVersion = "23.0.3"

targetSdkVersion = 23
targetSdkVersion = 30

versionCode = 800400
versionName = "0.8.4"
Expand Down
3 changes: 2 additions & 1 deletion android/ijkplayer/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-armv5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 9
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
}
buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-armv5/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
package="tv.danmaku.ijk.media.player_armv5" >

<uses-sdk
android:minSdkVersion="9" />
android:minSdkVersion="14" />

</manifest>
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-armv7a/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 9
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
}
buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-armv7a/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
package="tv.danmaku.ijk.media.player_armv7a" >

<uses-sdk
android:minSdkVersion="9" />
android:minSdkVersion="14" />

</manifest>
38 changes: 20 additions & 18 deletions android/ijkplayer/ijkplayer-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ android {
}
defaultConfig {
applicationId "tv.danmaku.ijk.media.example"
minSdkVersion 9
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
flavorDimensions "versionCode"
}
buildTypes {
release {
Expand All @@ -24,35 +25,36 @@ android {
}
}
productFlavors {
all32 { minSdkVersion 9 }
all64 { minSdkVersion 21 }
all32 { minSdkVersion 21 }
all64 { minSdkVersion 27 }
// armv5 {}
// armv7a {}
// arm64 { minSdkVersion 21 }
// x86 {}
}

}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:preference-v7:23.0.1'
compile 'com.android.support:support-annotations:23.0.1'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:preference-v7:28.0.0'
implementation 'com.android.support:support-annotations:28.0.0'

compile 'com.squareup:otto:1.3.8'
implementation 'com.squareup:otto:1.3.8'

compile project(':ijkplayer-java')
compile project(':ijkplayer-exo')
implementation project(':ijkplayer-java')
implementation project(':ijkplayer-exo')

all32Compile project(':ijkplayer-armv5')
all32Compile project(':ijkplayer-armv7a')
all32Compile project(':ijkplayer-x86')
// all32Compile project(':ijkplayer-armv5')
// all32Compile project(':ijkplayer-armv7a')
// all32Compile project(':ijkplayer-x86')

all64Compile project(':ijkplayer-armv5')
all64Compile project(':ijkplayer-armv7a')
all64Compile project(':ijkplayer-arm64')
all64Compile project(':ijkplayer-x86')
all64Compile project(':ijkplayer-x86_64')
// all64Implementation project(':ijkplayer-armv5')
all64Implementation project(':ijkplayer-armv7a')
all64Implementation project(':ijkplayer-arm64')
// all64Compile project(':ijkplayer-x86')
// all64Compile project(':ijkplayer-x86_64')

// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.4'
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.4'
Expand Down
4 changes: 2 additions & 2 deletions android/ijkplayer/ijkplayer-example/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
package="tv.danmaku.ijk.media.example">

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="22" />
android:minSdkVersion="14"
android:targetSdkVersion="30" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
Expand Down
1 change: 1 addition & 0 deletions ...r-example/src/main/java/tv/danmaku/ijk/media/example/activities/FileExplorerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import android.support.v4.app.FragmentTransaction;
import android.text.TextUtils;


import com.squareup.otto.Subscribe;

import java.io.File;
Expand Down
3 changes: 3 additions & 0 deletions ...ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/application/AppActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.RequiresApi;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
Expand All @@ -37,6 +39,7 @@
public class AppActivity extends AppCompatActivity {
private static final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 1;

@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
2 changes: 1 addition & 1 deletion ...example/src/main/java/tv/danmaku/ijk/media/example/fragments/SampleMediaListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void onItemClick(AdapterView<?> parent, View view, final int position, fi
}
});

mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8", "bipbop basic master playlist");
mAdapter.addItem("http://live-record.pddpic.com/pdd-live-record/timeshift/17283_production_sprite_20210119_87451018_01_20210119173552_20210119180552.m3u8", "bipbop basic master playlist");
mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear1/prog_index.m3u8", "bipbop basic 400x300 @ 232 kbps");
mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear2/prog_index.m3u8", "bipbop basic 640x480 @ 650 kbps");
mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear3/prog_index.m3u8", "bipbop basic 640x480 @ 1 Mbps");
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-exo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
abortOnError false
}
defaultConfig {
minSdkVersion 9
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
}
buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
abortOnError false
}
defaultConfig {
minSdkVersion 9
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
}
buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-java/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
package="tv.danmaku.ijk.media.player" >

<uses-sdk
android:minSdkVersion="9" />
android:minSdkVersion="14" />

</manifest>
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-x86/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 9
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
}
buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-x86/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
package="tv.danmaku.ijk.media.player_x86">

<uses-sdk
android:minSdkVersion="9" />
android:minSdkVersion="14" />

</manifest>
1 change: 1 addition & 0 deletions config/module.sh_bkp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module-lite.sh