Date: Sat, 30 Jun 2018 19:25:33 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473631 - in head/mail/thunderbird: . files Message-ID: <201806301925.w5UJPXTm026913@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sat Jun 30 19:25:32 2018 New Revision: 473631 URL: https://svnweb.freebsd.org/changeset/ports/473631 Log: mail/thunderbird: Backport sndio volume handling fix https://bugzilla.mozilla.org/show_bug.cgi?id=1467882 PR: 229135 Approved by: gecko (jbeich) Added: head/mail/thunderbird/files/patch-bug1467882 - copied unchanged from r473630, head/www/seamonkey/files/patch-bug1467882 Modified: head/mail/thunderbird/Makefile Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Sat Jun 30 19:24:21 2018 (r473630) +++ head/mail/thunderbird/Makefile Sat Jun 30 19:25:32 2018 (r473631) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 52.8.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: head/mail/thunderbird/files/patch-bug1467882 (from r473630, head/www/seamonkey/files/patch-bug1467882) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1467882 Sat Jun 30 19:25:32 2018 (r473631, copy of r473630, head/www/seamonkey/files/patch-bug1467882) @@ -0,0 +1,70 @@ +--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2018-04-04 00:35:17 UTC ++++ mozilla/media/libcubeb/src/cubeb_sndio.c +@@ -43,17 +43,33 @@ struct cubeb_stream { + cubeb_data_callback data_cb; /* cb to preapare data */ + cubeb_state_callback state_cb; /* cb to notify about state changes */ + void *arg; /* user arg to {data,state}_cb */ ++ float volume; /* current volume */ + }; + + static void +-float_to_s16(void *ptr, long nsamp) ++s16_setvol(void *ptr, long nsamp, float volume) + { + int16_t *dst = ptr; ++ int32_t mult = volume * 32768; ++ int32_t s; ++ ++ while (nsamp-- > 0) { ++ s = *dst; ++ s = (s * mult) >> 15; ++ *(dst++) = s; ++ } ++} ++ ++static void ++float_to_s16(void *ptr, long nsamp, float volume) ++{ ++ int16_t *dst = ptr; + float *src = ptr; ++ float mult = volume * 32768; + int s; + + while (nsamp-- > 0) { +- s = lrintf(*(src++) * 32768); ++ s = lrintf(*(src++) * mult); + if (s < -32768) + s = -32768; + else if (s > 32767) +@@ -111,7 +127,9 @@ sndio_mainloop(void *arg) + break; + } + if (s->conv) +- float_to_s16(s->buf, nfr * s->pchan); ++ float_to_s16(s->buf, nfr * s->pchan, s->volume); ++ else ++ s16_setvol(s->buf, nfr * s->pchan, s->volume); + start = 0; + end = nfr * s->bpf; + } +@@ -260,6 +278,7 @@ sndio_stream_init(cubeb * context, + free(s); + return CUBEB_ERROR; + } ++ s->volume = 1.; + *stream = s; + DPR("sndio_stream_init() end, ok\n"); + (void)context; +@@ -346,7 +365,11 @@ sndio_stream_set_volume(cubeb_stream *s, float volume) + { + DPR("sndio_stream_set_volume(%f)\n", volume); + pthread_mutex_lock(&s->mtx); +- sio_setvol(s->hdl, SIO_MAXVOL * volume); ++ if (volume < 0.) ++ volume = 0.; ++ else if (volume > 1.0) ++ volume = 1.; ++ s->volume = volume; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806301925.w5UJPXTm026913>