summaryrefslogtreecommitdiff
path: root/www/chromium/files/sndio_input.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2018-08-07 13:56:28 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2018-08-07 13:56:28 +0000
commit76360496491c8b5323b6655362a2193e36b3d774 (patch)
tree0a15731855dec4e02e5f3187543ac18c0bceebd0 /www/chromium/files/sndio_input.cc
parentUpdate to 1.14.0. (diff)
www/chromium: Update to 68.0.3440.84
Changelog: https://chromium.googlesource.com/chromium/src/+log/67.0.3396.87..68.0.3440.84?pretty=fuller&n=10000 At the moment pkg-message says that in order to work around the hanging tabs problem the user may wish to run the following commands: # [ -d ~{user}/.cache/chromium ] || mkdir ~{user}/.cache/chromium # echo "md $(echo ~{user})/.cache/chromium mfs rw,late,-w{user}:{group},-s300m 2 0" >> /etc/fstab # mount ~{user}/.cache/chromium Add fix-hanging-tabs.sh script to the DATADIR [1], which simplifies the process to just running /usr/local/share/chromium/fix-hanging-tabs.sh $user $group PR: 230264 [1] Submitted by: 0mp [1] MFH: 2018Q3 Security: http://vuxml.freebsd.org/freebsd/b9c525d9-9198-11e8-beba-080027ef1a23.html
Notes
Notes: svn path=/head/; revision=476599
Diffstat (limited to 'www/chromium/files/sndio_input.cc')
-rw-r--r--www/chromium/files/sndio_input.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/www/chromium/files/sndio_input.cc b/www/chromium/files/sndio_input.cc
index 3cf19a8a2d6d..4a00d8ac1083 100644
--- a/www/chromium/files/sndio_input.cc
+++ b/www/chromium/files/sndio_input.cc
@@ -15,11 +15,13 @@
namespace media {
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
void sndio_in_onmove(void *arg, int delta) {
NOTIMPLEMENTED();
SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
- self->hw_delay_ = delta - self->params_.GetBytesPerFrame();
+ self->hw_delay_ = delta - self->params_.GetBytesPerFrame(kSampleFormat);
}
void *sndio_in_threadstart(void *arg) {
@@ -36,9 +38,7 @@ SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* audio_manager,
: audio_manager_(audio_manager),
device_name_(device_name),
params_(params),
- bytes_per_buffer_(params.frames_per_buffer() *
- (params.channels() * params.bits_per_sample()) /
- 8),
+ bytes_per_buffer_(params.GetBytesPerBuffer(kSampleFormat)),
buffer_duration_(base::TimeDelta::FromMicroseconds(
params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
static_cast<float>(params.sample_rate()))),
@@ -66,7 +66,7 @@ bool SndioAudioInputStream::Open() {
sio_initpar(&par);
par.rate = params_.sample_rate();
par.pchan = params_.channels();
- par.bits = params_.bits_per_sample();
+ par.bits = SampleFormatToBytesPerChannel(kSampleFormat);
par.bps = par.bits / 8;
par.sig = sig = par.bits != 8 ? 1 : 0;
par.le = SIO_LE_NATIVE;
@@ -88,7 +88,7 @@ bool SndioAudioInputStream::Open() {
if (par.rate != (unsigned int)params_.sample_rate() ||
par.pchan != (unsigned int)params_.channels() ||
- par.bits != (unsigned int)params_.bits_per_sample() ||
+ par.bits != (unsigned int)SampleFormatToBytesPerChannel(kSampleFormat) ||
par.sig != (unsigned int)sig ||
(par.bps > 1 && par.le != SIO_LE_NATIVE) ||
(par.bits != par.bps * 8)) {
@@ -162,4 +162,9 @@ bool SndioAudioInputStream::IsMuted() {
return false;
}
+void SndioAudioInputStream::SetOutputDeviceForAec(
+ const std::string& output_device_id) {
+// Not supported. Do nothing.
+}
+
} // namespace media