Merge branch 'v1.0.x' of https://github.com/tencentyun/iot-ijkplayer into v1.0.x

Author: tonychanchen

android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java

@@ -114,6 +114,11 @@ protected final boolean notifyOnInfoSEI(int what, int extra, String seicontent)
         return mOnInfoListener != null && mOnInfoListener.onInfoSEI(this, what, extra, seicontent);
     }
 
+    protected final void notifyOnInfoAudioPcmData(byte[] arrPcm, int length) {
+        if (mOnInfoListener != null)
+            mOnInfoListener.onInfoAudioPcmData(this, arrPcm, length);
+    }
+
     protected final void notifyOnTimedText(IjkTimedText text) {
         if (mOnTimedTextListener != null)
             mOnTimedTextListener.onTimedText(this, text);

android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java

@@ -175,6 +175,7 @@ interface OnErrorListener {
     interface OnInfoListener {
         boolean onInfo(IMediaPlayer mp, int what, int extra);
         boolean onInfoSEI(IMediaPlayer mp, int what, int extra, String sei_content);
+        void onInfoAudioPcmData(IMediaPlayer mp, byte[] arrPcm, int length);
     }
 
     interface OnTimedTextListener {

android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java

@@ -76,6 +76,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
     private static final int MEDIA_SEEK_COMPLETE = 4;
     private static final int MEDIA_SET_VIDEO_SIZE = 5;
     private static final int MEDIA_SET_VIDEO_SEI  = 7;        // arg1 = width, arg2 = height, obj = SEI Content
+    private static final int MEDIA_AUDIO_PCM_DATA  = 8;       // obj = PCM data, arg1 = PCM size
     private static final int MEDIA_TIMED_TEXT = 99;
     private static final int MEDIA_ERROR = 100;
     private static final int MEDIA_INFO = 200;
@@ -1047,6 +1048,12 @@ public void handleMessage(Message msg) {
                     player.notifyOnInfoSEI(msg.arg1, msg.arg2, (String)msg.obj);
                 }
                 break;
+
+            case MEDIA_AUDIO_PCM_DATA:
+                if (msg.obj != null) {
+                    player.notifyOnInfoAudioPcmData((byte[])msg.obj, msg.arg1);
+                }
+                break;
             case MEDIA_NOP: // interface test message - ignore
                 break;
 

android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java

@@ -307,6 +307,11 @@ public boolean onInfo(IMediaPlayer mp, int what, int extra) {
                 public boolean onInfoSEI(IMediaPlayer mp, int what, int extra, String seicontent) {
                     return finalListener.onInfoSEI(MediaPlayerProxy.this, what, extra, seicontent);
                 }
+
+                @Override
+                public void onInfoAudioPcmData(IMediaPlayer mp, byte[] arrPcm, int length) {
+                    finalListener.onInfoAudioPcmData(MediaPlayerProxy.this, arrPcm, length);
+                }
             });
         } else {
             mBackEndMediaPlayer.setOnInfoListener(null);

ijkmedia/ijkplayer/android/ijkplayer_android_def.h

@@ -38,6 +38,7 @@ enum media_event_type {
     MEDIA_SET_VIDEO_SIZE    = 5,        // arg1 = width, arg2 = height
     MEDIA_GET_IMG_STATE     = 6,        // arg1 = timestamp, arg2 = result code, obj = file name
     MEDIA_SET_VIDEO_SEI     = 7,        // arg1 = width, arg2 = height, obj = SEI Content
+    MEDIA_AUDIO_PCM_DATA    = 8,        // obj = PCM data, arg1 = PCM size
     MEDIA_TIMED_TEXT        = 99,       // not supported yet
     MEDIA_ERROR             = 100,      // arg1, arg2
     MEDIA_INFO              = 200,      // arg1, arg2

ijkmedia/ijkplayer/android/ijkplayer_jni.c

@@ -1034,6 +1034,19 @@ static void message_loop_n(JNIEnv *env, IjkMediaPlayer *mp)
                 J4A_DeleteLocalRef__p(env, &text);
             }
             break;
+        case FFP_MSG_PCM_DATA:
+            MPTRACE("FFP_MSG_PCM_DATA:\n",);
+            if (msg.obj) {
+                // 创建一个 byte[] 数组   长度msg.arg1
+                jbyteArray byteArray = (*env)->NewByteArray(env, msg.arg1);
+                if (byteArray != NULL) {
+                    // 将数据拷贝到 byte[] 数组中
+                    (*env)->SetByteArrayRegion(env, byteArray, 0, msg.arg1, (jbyte *)msg.obj);
+                    post_event2(env, weak_thiz, MEDIA_AUDIO_PCM_DATA, msg.arg1, 0, byteArray);
+                    J4A_DeleteLocalRef__p(env, &byteArray);
+                }
+            }
+            break;
         case FFP_MSG_VIDEO_SIZE_CHANGED:
             MPTRACE("FFP_MSG_VIDEO_SIZE_CHANGED: %d, %d\n", msg.arg1, msg.arg2);
             post_event(env, weak_thiz, MEDIA_SET_VIDEO_SIZE, msg.arg1, msg.arg2);