From owner-svn-ports-all@freebsd.org Sun Jul 28 18:05:42 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E118B0BDE; Sun, 28 Jul 2019 18:05:42 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 685F6700EB; Sun, 28 Jul 2019 18:05:39 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BFB11B8BA; Sun, 28 Jul 2019 18:05:34 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6SI5YA4052088; Sun, 28 Jul 2019 18:05:34 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6SI5XEf052086; Sun, 28 Jul 2019 18:05:33 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201907281805.x6SI5XEf052086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 28 Jul 2019 18:05:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507520 - head/www/chromium/files X-SVN-Group: ports-head X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: head/www/chromium/files X-SVN-Commit-Revision: 507520 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 685F6700EB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.991,0]; NEURAL_HAM_SHORT(-0.93)[-0.928,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jul 2019 18:05:42 -0000 Author: cpm Date: Sun Jul 28 18:05:33 2019 New Revision: 507520 URL: https://svnweb.freebsd.org/changeset/ports/507520 Log: www/chromium: Fix audio/video synchronization bug after r506266 PR: 238869 Submitted by: tobik Reported by: jrm MFH: 2019Q3 Modified: head/www/chromium/files/sndio_input.cc head/www/chromium/files/sndio_output.cc Modified: head/www/chromium/files/sndio_input.cc ============================================================================== --- head/www/chromium/files/sndio_input.cc Sun Jul 28 18:05:25 2019 (r507519) +++ head/www/chromium/files/sndio_input.cc Sun Jul 28 18:05:33 2019 (r507520) @@ -188,7 +188,7 @@ void SndioAudioInputStream::ThreadLoop(void) { // convert frames count to TimeDelta const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, - params.sample_rate() * 1000); + params.sample_rate()); // push into bus audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat)); Modified: head/www/chromium/files/sndio_output.cc ============================================================================== --- head/www/chromium/files/sndio_output.cc Sun Jul 28 18:05:25 2019 (r507519) +++ head/www/chromium/files/sndio_output.cc Sun Jul 28 18:05:33 2019 (r507520) @@ -140,7 +140,7 @@ void SndioAudioOutputStream::GetVolume(double* v) { } void SndioAudioOutputStream::ThreadLoop(void) { - int avail, count; + int avail, count, result; while (state == kRunning) { // Update volume if needed @@ -152,7 +152,8 @@ void SndioAudioOutputStream::ThreadLoop(void) { pthread_mutex_unlock(&mutex); // Get data to play - const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, params.sample_rate() * 1000); + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer); if (count == 0) { @@ -164,8 +165,8 @@ void SndioAudioOutputStream::ThreadLoop(void) { // Submit data to the device avail = count * params.GetBytesPerFrame(kSampleFormat); - count = sio_write(hdl, buffer, avail); - if (count == 0) { + result = sio_write(hdl, buffer, avail); + if (result == 0) { LOG(WARNING) << "Audio device disconnected."; break; }