<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } </style> </head> <body> <div class="content"> <h3> PulseAudio Marge Bot pushed to branch master at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio">PulseAudio / pulseaudio</a> </h3> <h4> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/015028d7e33ebc5c0fb84877296a9a5aefa603c3">015028d7</a> <div> by Georg Chini at 2021-03-25T02:29:42+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">alsa-sink: Do not increase watermark when requested to rewind 0 bytes Since commit cb91d7a1 the watermark is increased when there is nothing to rewind. This is also done in the case when there was actually no rewind requested at all, so the watermark is increased needlessly. This patch fixes the issue by skipping the rewind if none is requested. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/530> </pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#b14579bff79260723b2b3e03f2ef1886578218f4"> src/modules/alsa/alsa-sink.c </a> </li> </ul> <h4>Changes:</h4> <li id="b14579bff79260723b2b3e03f2ef1886578218f4"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/015028d7e33ebc5c0fb84877296a9a5aefa603c3#b14579bff79260723b2b3e03f2ef1886578218f4">src/modules/alsa/alsa-sink.c</a> <hr> <table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="1825" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="1825" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -1825,6 +1825,9 @@ static int process_rewind(struct userdata *u) {</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1825" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1825 </td> <td class="new_line diff-line-num" data-linenumber="1825" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1825 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1826" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1826 </td> <td class="new_line diff-line-num" data-linenumber="1826" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1826 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1827" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1827 </td> <td class="new_line diff-line-num" data-linenumber="1827" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1827 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1828" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1828" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 1828 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if (rewind_nbytes == 0) </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1828" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1829" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 1829 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ goto rewind_done; </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="1828" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="1830" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 1830 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1828" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1828 </td> <td class="new_line diff-line-num" data-linenumber="1831" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1831 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if (PA_UNLIKELY((unused = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) { </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1829" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1829 </td> <td class="new_line diff-line-num" data-linenumber="1832" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1832 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if ((err = try_recover(u, "snd_pcm_avail", (int) unused)) < 0) { </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="1830" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1830 </td> <td class="new_line diff-line-num" data-linenumber="1833" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 1833 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_log_warn("Trying to recover from underrun failed during rewind"); </pre> </td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/015028d7e33ebc5c0fb84877296a9a5aefa603c3">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/015028d7e33ebc5c0fb84877296a9a5aefa603c3"}}</script> </div> </body> </html>