diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c index 98800d593450c66bebd4ea4fcb451228e6c8e240..6aa4c21e49bcdc66ba4ae3d4b8e13d77d8e75c49 100644 --- a/ijkmedia/ijkplayer/ff_ffplay.c +++ b/ijkmedia/ijkplayer/ff_ffplay.c @@ -3100,16 +3100,6 @@ void ffp_set_overlay_format(FFPlayer *ffp, int chroma_fourcc) } } -void ffp_set_picture_queue_capicity(FFPlayer *ffp, int frame_count) -{ - ffp->pictq_size = frame_count; -} - -void ffp_set_framedrop(FFPlayer *ffp, int framedrop) -{ - ffp->framedrop = framedrop; -} - void ffp_set_auto_play_on_prepared(FFPlayer *ffp, int auto_play_on_prepared) { ffp->auto_play_on_prepared = auto_play_on_prepared; diff --git a/ijkmedia/ijkplayer/ff_ffplay.h b/ijkmedia/ijkplayer/ff_ffplay.h index 4547b83f6bafb28818af7bc9e63547e8a48dafa7..df31b67e261008c83a394077c77ff02a4f568748 100644 --- a/ijkmedia/ijkplayer/ff_ffplay.h +++ b/ijkmedia/ijkplayer/ff_ffplay.h @@ -56,8 +56,6 @@ void ffp_set_option(FFPlayer *ffp, int opt_category, const char *name, cons void ffp_set_option_int(FFPlayer *ffp, int opt_category, const char *name, int64_t value); void ffp_set_overlay_format(FFPlayer *ffp, int chroma_fourcc); -void ffp_set_picture_queue_capicity(FFPlayer *ffp, int frame_count); -void ffp_set_framedrop(FFPlayer *ffp, int framedrop); void ffp_set_auto_play_on_prepared(FFPlayer *ffp, int auto_play_on_prepared); void ffp_set_max_buffer_size(FFPlayer *ffp, int max_buffer_size); diff --git a/ijkmedia/ijkplayer/ijkplayer.c b/ijkmedia/ijkplayer/ijkplayer.c index 14c76f38cf8a768aad2452d20a3fc2cbd9be8756..39924058829fb412717f32145db36635360c9be7 100644 --- a/ijkmedia/ijkplayer/ijkplayer.c +++ b/ijkmedia/ijkplayer/ijkplayer.c @@ -209,11 +209,7 @@ void ijkmp_set_picture_queue_capicity(IjkMediaPlayer *mp, int frame_count) { assert(mp); - MPTRACE("ijkmp_set_picture_queue_capicity(%d)\n", frame_count); - pthread_mutex_lock(&mp->mutex); - ffp_set_picture_queue_capicity(mp->ffplayer, frame_count); - pthread_mutex_unlock(&mp->mutex); - MPTRACE("ijkmp_set_picture_queue_capicity()=void\n"); + ijkmp_set_option_int(mp, IJKMP_OPT_CATEGORY_PLAYER, "video-pictq-size", frame_count); } void ijkmp_set_max_fps(IjkMediaPlayer *mp, int max_fps) diff --git a/ijkmedia/ijkplayer/ijkplayer.h b/ijkmedia/ijkplayer/ijkplayer.h index e4ef01d0a3e20e354e05686e285eb3519ff7895f..54972a38a254fa539d89069368b2814ca7ea9eb6 100644 --- a/ijkmedia/ijkplayer/ijkplayer.h +++ b/ijkmedia/ijkplayer/ijkplayer.h @@ -175,8 +175,11 @@ void ijkmp_set_option(IjkMediaPlayer *mp, int opt_category, const cha void ijkmp_set_option_int(IjkMediaPlayer *mp, int opt_category, const char *name, int64_t value); void ijkmp_set_overlay_format(IjkMediaPlayer *mp, int chroma_fourcc); +attribute_deprecated void ijkmp_set_picture_queue_capicity(IjkMediaPlayer *mp, int frame_count); +attribute_deprecated void ijkmp_set_max_fps(IjkMediaPlayer *mp, int max_fps); +attribute_deprecated void ijkmp_set_framedrop(IjkMediaPlayer *mp, int framedrop); void ijkmp_set_auto_play_on_prepared(IjkMediaPlayer *mp, int auto_play_on_prepared); void ijkmp_set_max_buffer_size(IjkMediaPlayer *mp, int max_buffer_size);