Skip to content

Commit d8338a0

Browse files
committed
注掉和exoplayer相关的代码
1 parent 6622310 commit d8338a0

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed

android/ijkplayer/ijkplayer-example/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
implementation 'com.squareup:otto:1.3.8'
5858

5959
implementation project(':ijkplayer-java')
60-
implementation project(':ijkplayer-exo')
60+
// implementation project(':ijkplayer-exo')
6161

6262
all32Implementation project(':ijkplayer-armv5')
6363
all32Implementation project(':ijkplayer-armv7a')
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package tv.danmaku.ijk.media.example;
22

3-
import android.app.Application;
4-
import android.test.ApplicationTestCase;
3+
//import android.app.Application;
4+
//import android.test.ApplicationTestCase;
55

66
/**
77
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
88
*/
9-
public class ApplicationTest extends ApplicationTestCase<Application> {
10-
public ApplicationTest() {
11-
super(Application.class);
12-
}
13-
}
9+
//public class ApplicationTest extends ApplicationTestCase<Application> {
10+
// public ApplicationTest() {
11+
// super(Application.class);
12+
// }
13+
//}

android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import java.util.regex.Matcher;
4949
import java.util.regex.Pattern;
5050

51-
import tv.danmaku.ijk.media.exo.IjkExoMediaPlayer;
51+
//import tv.danmaku.ijk.media.exo.IjkExoMediaPlayer;
5252
import tv.danmaku.ijk.media.player.AndroidMediaPlayer;
5353
import tv.danmaku.ijk.media.player.IMediaPlayer;
5454
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
@@ -533,6 +533,16 @@ public boolean onInfo(IMediaPlayer mp, int arg1, int arg2) {
533533
}
534534
return true;
535535
}
536+
537+
@Override
538+
public boolean onInfoSEI(IMediaPlayer mp, int what, int extra, String sei_content) {
539+
return false;
540+
}
541+
542+
@Override
543+
public void onInfoAudioPcmData(IMediaPlayer mp, byte[] arrPcm, int length) {
544+
545+
}
536546
};
537547

538548
private IMediaPlayer.OnErrorListener mErrorListener =
@@ -1026,11 +1036,11 @@ public IMediaPlayer createPlayer(int playerType) {
10261036
IMediaPlayer mediaPlayer = null;
10271037

10281038
switch (playerType) {
1029-
case Settings.PV_PLAYER__IjkExoMediaPlayer: {
1030-
IjkExoMediaPlayer IjkExoMediaPlayer = new IjkExoMediaPlayer(mAppContext);
1031-
mediaPlayer = IjkExoMediaPlayer;
1032-
}
1033-
break;
1039+
// case Settings.PV_PLAYER__IjkExoMediaPlayer: {
1040+
// IjkExoMediaPlayer IjkExoMediaPlayer = new IjkExoMediaPlayer(mAppContext);
1041+
// mediaPlayer = IjkExoMediaPlayer;
1042+
// }
1043+
// break;
10341044
case Settings.PV_PLAYER__AndroidMediaPlayer: {
10351045
AndroidMediaPlayer androidMediaPlayer = new AndroidMediaPlayer();
10361046
mediaPlayer = androidMediaPlayer;

0 commit comments

Comments
 (0)