Mercurial > mplayer.hg
view mixer.c @ 22616:09dc129234a0
Matroska seeking fixes
If a relative seek forward went past the last index position the
Matroska demuxer did not seek to any index position. It did however set
the mkv_d->skip_to_timecode variable which meant that the next
fill_buffer() call would read from the current position until the target
position (probably the end of the file). Fix this by changing the code
to seek to the last index position if that is between the current and
target positions.
Also change backwards relative seek to accept an exactly matching index
position (<= vs <) and reorganize the seeking conditionals to allow
making the above change without turning the code into a complete mess.
author | uau |
---|---|
date | Fri, 16 Mar 2007 14:55:41 +0000 |
parents | 75b84965d137 |
children | 519e42b716aa |
line wrap: on
line source
#include <string.h> #ifndef __MINGW32__ #include <sys/ioctl.h> #endif #include <fcntl.h> #include <stdio.h> #include <unistd.h> #include "config.h" #include "libao2/audio_out.h" #include "libaf/af.h" #include "mixer.h" #include "help_mp.h" char * mixer_device=NULL; char * mixer_channel=NULL; int soft_vol = 0; float soft_vol_max = 110.0; void mixer_getvolume(mixer_t *mixer, float *l, float *r) { ao_control_vol_t vol; *l=0; *r=0; if(mixer->audio_out){ if(soft_vol || CONTROL_OK != mixer->audio_out->control(AOCONTROL_GET_VOLUME,&vol)) { if (!mixer->afilter) return; else { float db_vals[AF_NCH]; if (!af_control_any_rev(mixer->afilter, AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET, db_vals)) db_vals[0] = db_vals[1] = 1.0; else af_from_dB (2, db_vals, db_vals, 20.0, -200.0, 60.0); vol.left = (db_vals[0] / (soft_vol_max / 100.0)) * 100.0; vol.right = (db_vals[1] / (soft_vol_max / 100.0)) * 100.0; } } *r=vol.right; *l=vol.left; } } void mixer_setvolume(mixer_t *mixer, float l, float r) { ao_control_vol_t vol; vol.right=r; vol.left=l; if(mixer->audio_out){ if(soft_vol || CONTROL_OK != mixer->audio_out->control(AOCONTROL_SET_VOLUME,&vol)) { if (!mixer->afilter) return; else { // af_volume uses values in dB float db_vals[AF_NCH]; int i; db_vals[0] = (l / 100.0) * (soft_vol_max / 100.0); db_vals[1] = (r / 100.0) * (soft_vol_max / 100.0); for (i = 2; i < AF_NCH; i++) { db_vals[i] = ((l + r) / 100.0) * (soft_vol_max / 100.0) / 2.0; } af_to_dB (AF_NCH, db_vals, db_vals, 20.0); if (!af_control_any_rev(mixer->afilter, AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, db_vals)) { mp_msg(MSGT_GLOBAL, MSGL_INFO, MSGTR_InsertingAfVolume); if (af_add(mixer->afilter, "volume")) { if (!af_control_any_rev(mixer->afilter, AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, db_vals)) { mp_msg(MSGT_GLOBAL, MSGL_ERR, MSGTR_NoVolume); return; } } } } } } mixer->muted=0; } void mixer_incvolume(mixer_t *mixer) { float mixer_l, mixer_r; mixer_getvolume(mixer, &mixer_l, &mixer_r); mixer_l += mixer->volstep; if ( mixer_l > 100 ) mixer_l = 100; mixer_r += mixer->volstep; if ( mixer_r > 100 ) mixer_r = 100; mixer_setvolume(mixer, mixer_l, mixer_r); } void mixer_decvolume(mixer_t *mixer) { float mixer_l, mixer_r; mixer_getvolume(mixer, &mixer_l, &mixer_r); mixer_l -= mixer->volstep; if ( mixer_l < 0 ) mixer_l = 0; mixer_r -= mixer->volstep; if ( mixer_r < 0 ) mixer_r = 0; mixer_setvolume(mixer, mixer_l, mixer_r); } void mixer_getbothvolume(mixer_t *mixer, float *b) { float mixer_l, mixer_r; mixer_getvolume(mixer, &mixer_l, &mixer_r); *b = ( mixer_l + mixer_r ) / 2; } void mixer_mute(mixer_t *mixer) { if (mixer->muted) mixer_setvolume(mixer, mixer->last_l, mixer->last_r); else { mixer_getvolume(mixer, &mixer->last_l, &mixer->last_r); mixer_setvolume(mixer, 0, 0); mixer->muted=1; } }