xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ffplay: change keyboard volume control to logarithmic

Browse Source 
The command line parameter remains linear.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2017-02-05 01:16:29 +01:00
parent d1acab8293
commit 3aae1eff12
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@ -73,8 +73,8 @@ const int program_birth_year = 2003;
/* Calculate actual buffer size keeping in mind not cause too frequent audio callbacks */ /* Calculate actual buffer size keeping in mind not cause too frequent audio callbacks */
#define SDL_AUDIO_MAX_CALLBACKS_PER_SEC 30 #define SDL_AUDIO_MAX_CALLBACKS_PER_SEC 30
/* Step size for volume control */ /* Step size for volume control in dB */
#define SDL_VOLUME_STEP (SDL_MIX_MAXVOLUME / 50) #define SDL_VOLUME_STEP (0.75)
/* no AV sync correction is done if below the minimum AV sync threshold */ /* no AV sync correction is done if below the minimum AV sync threshold */
#define AV_SYNC_THRESHOLD_MIN 0.04 #define AV_SYNC_THRESHOLD_MIN 0.04
@ -1450,9 +1450,11 @@ static void toggle_mute(VideoState *is)
is->muted = !is->muted; is->muted = !is->muted;
} }
static void update_volume(VideoState *is, int sign, int step) static void update_volume(VideoState *is, int sign, double step)
{ {
is->audio_volume = av_clip(is->audio_volume + sign * step, 0, SDL_MIX_MAXVOLUME); double volume_level = is->audio_volume ? (20 * log(is->audio_volume / (double)SDL_MIX_MAXVOLUME) / log(10)) : -1000.0;
int new_volume = lrint(SDL_MIX_MAXVOLUME * pow(10.0, (volume_level + sign * step) / 20.0));
is->audio_volume = av_clip(is->audio_volume == new_volume ? (is->audio_volume + sign) : new_volume, 0, SDL_MIX_MAXVOLUME);
} }
static void step_to_next_frame(VideoState *is) static void step_to_next_frame(VideoState *is)