Skip to content

Commit 8d57675

Browse files
author
eagleychen
committed
mjpeg直播用fps,云存用pts
1 parent 9fdb6c3 commit 8d57675

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

ijkmedia/ijkplayer/ff_ffplay.c

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,22 +1290,6 @@ static void check_external_clock_speed(VideoState *is, FFPlayer *ffp) {
12901290
set_clock_speed(&is->extclk, 1);
12911291
}
12921292
}
1293-
}else{
1294-
1295-
1296-
if (is->videoq.nb_packets > EXTERNAL_CLOCK_MAX_FRAMES) {
1297-
double speed = is->extclk.speed;
1298-
if (speed == 1.0) {
1299-
set_clock_speed(&is->extclk, ffp->audio_speed);
1300-
}
1301-
// printf("speeddddddd===5mjpeg===packets===>%d==>%f===>%f\n",is->videoq.nb_packets,speed, ffp->audio_speed);
1302-
}else if (is->videoq.nb_packets < EXTERNAL_CLOCK_MIN_FRAMES){
1303-
double speed = is->extclk.speed;
1304-
if (speed != 1.0) {
1305-
set_clock_speed(&is->extclk, 1);
1306-
}
1307-
// printf("speeddddddd===6mjpeg===packets===>%d==>%f\n",is->videoq.nb_packets,speed);
1308-
}
13091293
}
13101294
}
13111295
}
@@ -3379,7 +3363,9 @@ static int read_thread(void *arg)
33793363
}
33803364

33813365
is->realtime = is_realtime(ic, ffp->packet_buffering);
3382-
3366+
av_dict_set_int(&ic->metadata, "packet-buffering", ffp->packet_buffering, 0);
3367+
// printf("av_dict_set_int_packet-buffering111===>%d",ffp->packet_buffering);
3368+
33833369
av_dump_format(ic, 0, is->filename, 0);
33843370

33853371
int video_stream_count = 0;

init-android.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
2020
IJK_FFMPEG_UPSTREAM=https://github.com/tonychanchen/FFmpeg.git
2121
IJK_FFMPEG_FORK=https://github.com/tonychanchen/FFmpeg.git
22-
IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--002
22+
IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--003
2323
IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
2424

2525
set -e

init-ios.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
2020
IJK_FFMPEG_UPSTREAM=https://github.com/tonychanchen/FFmpeg.git
2121
IJK_FFMPEG_FORK=https://github.com/tonychanchen/FFmpeg.git
22-
IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--002
22+
IJK_FFMPEG_COMMIT=ff4.0--ijk0.8.8--20210205--003
2323
IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
2424

2525
IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git

ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#import "ijkioapplication.h"
3535
#include "string.h"
3636

37-
static const char *kIJKFFRequiredFFmpegVersion = "ff4.0--ijk0.8.8--20210205--002";
37+
static const char *kIJKFFRequiredFFmpegVersion = "ff4.0--ijk0.8.8--20210205--003";
3838

3939
// It means you didn't call shutdown if you found this object leaked.
4040
@interface IJKWeakHolder : NSObject

0 commit comments

Comments
 (0)