From 74f0f7d20fff662ce9c07dac7b7a4da473c45daf Mon Sep 17 00:00:00 2001 From: lionel0806 Date: Thu, 2 Jul 2015 16:56:02 +0800 Subject: [PATCH 1/2] fix a crash bug: when media resource not video or audio, the player will crash. --- ijkmedia/ijkplayer/ff_ffplay.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c index 760edef498..9a39317652 100644 --- a/ijkmedia/ijkplayer/ff_ffplay.c +++ b/ijkmedia/ijkplayer/ff_ffplay.c @@ -3408,9 +3408,15 @@ void ffp_check_buffering_l(FFPlayer *ffp) int buf_time_percent = -1; int hwm_in_bytes = ffp->high_water_mark_in_bytes; int need_start_buffering = 0; - int audio_time_base_valid = is->audio_st && is->audio_st->time_base.den > 0 && is->audio_st->time_base.num > 0; - int video_time_base_valid = is->video_st && is->video_st->time_base.den > 0 && is->video_st->time_base.num > 0; + int audio_time_base_valid = 0; + int video_time_base_valid = 0; int64_t buf_time_position = -1; + + if(is->audio_st) + audio_time_base_valid = is->audio_st->time_base.den > 0 && is->audio_st->time_base.num > 0; + if(is->video_st) + video_time_base_valid = is->video_st->time_base.den > 0 && is->video_st->time_base.num > 0; + if (hwm_in_ms > 0) { int cached_duration_in_ms = -1; int64_t audio_cached_duration = -1; From 5916122495ef500421bba91fdbfe4cba6ae8c83e Mon Sep 17 00:00:00 2001 From: Lionel Lee Date: Thu, 2 Jul 2015 17:16:15 +0800 Subject: [PATCH 2/2] Modify wrong path of MediaPlayer Api file in README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d060729700..1c2e6b5c74 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ijkplayer ========= - Video player based on [ffplay](http://ffmpeg.org) - - Android: [MediaPlayer-like](android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java) + - Android: [MediaPlayer-like](android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java) - iOS: [MediaPlayer.framework-like](ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayback.h) ### My Build Enviroment @@ -26,7 +26,7 @@ ijkplayer - Android - platform: API 9~22 - cpu: ARMv7a, x86, ARMv5 (ARMv5 is not tested on real devices) - - api: [MediaPlayer-like](android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IMediaPlayer.java) + - api: [MediaPlayer-like](android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java) - video output: NativeWindow - audio output: OpenSL ES, AudioTrack - hw decoder: MediaCodec (API 16+, Android 4.1+)