mjpeg直播用fps，云存用pts

tencentyun · Oct 15, 2024 · 8d57675 · 8d57675
1 parent 9fdb6c3
commit 8d57675
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c
@@ -1290,22 +1290,6 @@ static void check_external_clock_speed(VideoState *is, FFPlayer *ffp) {
                     set_clock_speed(&is->extclk, 1);
                 }
             }
-        }else{
-
-
-            if (is->videoq.nb_packets > EXTERNAL_CLOCK_MAX_FRAMES) {
-                double speed = is->extclk.speed;
-                if (speed == 1.0) {
-                    set_clock_speed(&is->extclk, ffp->audio_speed);
-                }
-//                printf("speeddddddd===5mjpeg===packets===>%d==>%f===>%f\n",is->videoq.nb_packets,speed, ffp->audio_speed);
-            }else if (is->videoq.nb_packets < EXTERNAL_CLOCK_MIN_FRAMES){
-                double speed = is->extclk.speed;
-                if (speed != 1.0) {
-                    set_clock_speed(&is->extclk, 1);
-                }
-//                printf("speeddddddd===6mjpeg===packets===>%d==>%f\n",is->videoq.nb_packets,speed);
-            }
         }
     }
 }
@@ -3379,7 +3363,9 @@ static int read_thread(void *arg)
     }
 
     is->realtime = is_realtime(ic, ffp->packet_buffering);
-
+    av_dict_set_int(&ic->metadata, "packet-buffering", ffp->packet_buffering, 0);
+//    printf("av_dict_set_int_packet-buffering111===>%d",ffp->packet_buffering);
+
     av_dump_format(ic, 0, is->filename, 0);
 
     int video_stream_count = 0;

diff --git a/init-android.sh b/init-android.sh
@@ -19,7 +19,7 @@
 # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
 IJK_FFMPEG_UPSTREAM=https://github.com/tonychanchen/FFmpeg.git
 IJK_FFMPEG_FORK=https://github.com/tonychanchen/FFmpeg.git
-IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--002
+IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--003
 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
 
 set -e

diff --git a/init-ios.sh b/init-ios.sh
@@ -19,7 +19,7 @@
 # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
 IJK_FFMPEG_UPSTREAM=https://github.com/tonychanchen/FFmpeg.git
 IJK_FFMPEG_FORK=https://github.com/tonychanchen/FFmpeg.git
-IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--002
+IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--003
 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
 
 IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
@@ -34,7 +34,7 @@
 #import "ijkioapplication.h"
 #include "string.h"
 
-static const char *kIJKFFRequiredFFmpegVersion = "ff4.0--ijk0.8.8--20210205--002";
+static const char *kIJKFFRequiredFFmpegVersion = "ff4.0--ijk0.8.8--20210205--003";
 
 // It means you didn't call shutdown if you found this object leaked.
 @interface IJKWeakHolder : NSObject