Mercurial > mplayer.hg
view etc/menu.conf @ 24590:2c238fa777ff
ao_alsa: Fix get_space() return values larger than buffersize
After a buffer underrun the ALSA get_space() function sometimes returned
values larger than the ao had set in ao_data.buffersize. Fix this by
replacing the old check against MAX_OUTBURST by one against
ao_data.buffersize. There should be no need for the MAX_OUTBURST check;
the current MPlayer side should no longer have any constant limit on the
amount of data an ao can buffer or request at once.
The get_space() values larger than ao_data.buffersize triggered errors
in audio decoding causing the current attempt to fill audio buffers to
be aborted. I'm not sure how often that caused behavior noticeably worse
then an underrun already is.
author | uau |
---|---|
date | Mon, 24 Sep 2007 21:49:58 +0000 |
parents | 2de8f66b3570 |
children | 96d0992c7920 |
line wrap: on
line source
<txt name="man" file="manpage.txt"/> <filesel name="open_file"/> <filesel name="open_list" file-action="loadlist '%p'" auto-close="yes" title="Open a playlist: %p" filter="/etc/mplayer/extensions_filter" actions="d:run 'mp_loader \'%p\' d',c:run 'mp_loader \'%p\' c'" /> <pt name="jump_to"/> <console name="console0" height="80" vspace="0">Welcome to MPlayer</console> <txt name="man" file="manpage.txt"/> <pref name="general_pref" title="General"> <e property="osdlevel" name="OSD level"/> <e property="speed" name="Speed"/> <e property="loop" name="Loop"/> </pref> <pref name="demuxer_pref" title="Demuxer"> </pref> <pref name="osd_sub_pref" title="Subtitles"> <e property="sub" name="Subtitles"/> <e property="sub_visibility" name="Visibility"/> <e property="sub_forced_only" name="Forced sub only"/> <e property="sub_alignment" name="Alignment"/> <e property="sub_pos" name="Position"/> <e property="sub_delay" name="Delay"/> <e property="sub_scale" name="Scale"/> </pref> <pref name="audio_pref" title="Audio"> <e property="volume" name="Volume"/> <e property="balance" name="Balance"/> <e property="mute" name="Mute"/> <e property="audio_delay" name="Delay"/> </pref> <pref name="colors_pref" title="Colors"> <e property="gamma" name="Gamma"/> <e property="brightness" name="Brightness"/> <e property="contrast" name="Contrast"/> <e property="saturation" name="Saturation"/> <e property="hue" name="Hue"/> </pref> <pref name="video_pref" title="Video"> <e property="fullscreen" name="Fullscreen"/> <e property="panscan" name="Panscan"/> <menu menu="colors_pref" name="Colors ..."/> <e property="ontop" name="Always on top"/> <e property="rootwin" name="Root window"/> <e property="framedropping" name="Frame dropping"/> <e property="vsync" name="VSync"/> </pref> <cmdlist name="pref_main" title="Preferences" ptr="<>" > <e name="General ..." ok="set_menu general_pref"/> <e name="Audio ..." ok="set_menu audio_pref"/> <e name="Video ..." ok="set_menu video_pref"/> <e name="Subtitles ..." ok="set_menu osd_sub_pref"/> <e name="Back" ok="menu cancel"/> </cmdlist> <pref name="properties" title="Stream Properties"> <e txt="${filename}" name="Name"/> <e txt="${video_format}" name="Video Codec"/> <e txt="${video_bitrate}" name="Video Bitrate"/> <e txt="${width} x ${height}" name="Resolution"/> <e txt="${audio_codec}" name="Audio Codec"/> <e txt="${audio_bitrate}" name="Audio Bitrate"/> <e txt="${samplerate}, ${channels}" name="Audio Samples"/> <e txt="${metadata/Title}" name="Title"/> <e txt="${metadata/Artist}" name="Artist"/> <e txt="${metadata/Album}" name="Album"/> <e txt="${metadata/Year}" name="Year"/> <e txt="${metadata/Comment}" name="Comment"/> <e txt="${metadata/Track}" name="Track"/> <e txt="${metadata/Genre}" name="Genre"/> <e txt="${metadata/Software}" name="Software"/> </pref> <cmdlist name="main" title="MPlayer OSD menu" ptr="<>" > <e name="Pause" ok="pause"/> <e name="Prev/Next" ok="pt_step 1" cancel="pt_step -1"/> <e name="Jump to ..." ok="set_menu jump_to"/> <e name="Open ..." ok="set_menu open_file"/> <e name="Open playlist ..." ok="set_menu open_list"/> <e name="Help" ok="set_menu man"/> <e name="Pref" ok="set_menu pref_main"/> <e name="Properties" ok="set_menu properties"/> <e name="Console" ok="set_menu console0"/> <e name="Quit" ok="quit"/> </cmdlist>