fix : 解决重新播放器时音频时间戳不对齐的问题

Signed-off-by: JeffMony <[email protected]>

#branch=master

Author: JeffMony

app/src/main/java/com/jeffmony/playerdemo/MainActivity.java

@@ -66,8 +66,9 @@ private void initViews() {
         // http://sns-video-bd.xhscdn.com/stream/110/258/01e4326d8b792647010370038764ff7d3c_258.mp4
         // http://videoconverter.vivo.com.cn/201706/655_1498479540118.mp4.main.m3u8
         // http://sns-video-bd.xhscdn.com/stream/110/258/01e4326d8b792647010370038764ff7d3c_258.mp4
-        mUrlText.setText("file:///storage/emulated/0/DCIM/Camera/long_gop.mp4");
+        // mUrlText.setText("file:///storage/emulated/0/DCIM/Camera/long_gop.mp4");
 
+        mUrlText.setText("file:///storage/emulated/0/Pictures/VIDEO_20230713_231426.mp4");
         mExoBtn.setOnClickListener(this);
         mIjkBtn.setOnClickListener(this);
         mOrcodeBtn.setOnClickListener(this);

playersdk/src/main/java/com/jeffmony/playersdk/impl/IjkPlayerImpl.java

@@ -27,7 +27,7 @@ public IjkPlayerImpl(Context context, PlayerParams params) {
         mPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec", 1);
 
         //不用opensles编解码
-        mPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "opensles", 0);
+        mPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "opensles", 1);
         mPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "overlay-format", IjkMediaPlayer.SDL_FCC_RV32);
         mPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "framedrop", 1);
         mPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "start-on-prepared", 0);

third_party/ijkmedia/ijkplayer/ff_ffplay.c

@@ -904,6 +904,7 @@ static void video_image_display2(FFPlayer *ffp)
             if (!ffp->first_video_frame_rendered) {
                 ffp->first_video_frame_rendered = 1;
                 ffp_notify_msg1(ffp, FFP_MSG_VIDEO_RENDERING_START);
+                is->audio_start_reset = 1;
             }
             while (is->pause_req && !is->abort_request) {
                 SDL_Delay(20);
@@ -914,6 +915,7 @@ static void video_image_display2(FFPlayer *ffp)
         if (!ffp->first_video_frame_rendered) {
             ffp->first_video_frame_rendered = 1;
             ffp_notify_msg1(ffp, FFP_MSG_VIDEO_RENDERING_START);
+            is->audio_start_reset = 1;
         }
 
         if (is->latest_video_seek_load_serial == vp->serial) {
@@ -2720,6 +2722,11 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len, int32_t aud
     /* Let's assume the audio driver that is used by SDL has two periods. */
     if (!isnan(is->audio_clock)) {
         double sync_audio_clock = is->audio_clock;
+        if (is->audio_start_reset) {
+            audio_render_time = 0;
+            *adjust_time = 0;
+            is->audio_start_reset = 0;
+        }
         if (is->audio_seek_req && is->seek_completed) {
             audio_render_time = is->seek_completed_pos;
             *adjust_time = audio_render_time;

third_party/ijkmedia/ijkplayer/ff_ffplay_def.h

@@ -426,6 +426,7 @@ typedef struct VideoState {
     int audio_seek_req;
     int seek_completed;
     int seek_completed_pos;
+    int audio_start_reset;
 } VideoState;
 
 /* options specified by the user */