Bug 1847009 - Update libcubeb to revision ac8474a5929. r=cubeb-reviewers,chunmin

Differential Revision: https://phabricator.services.mozilla.com/D185292
This commit is contained in:
Paul Adenot 2023-08-08 09:22:35 +00:00
Родитель e536fdec9c
Коммит c09ffeeb26
2 изменённых файлов: 8 добавлений и 12 удалений

Просмотреть файл

@ -9,8 +9,8 @@ origin:
description: "Cross platform audio library"
url: https://github.com/mozilla/cubeb
license: ISC
release: b9af56cee792f17a466db7b3ac3382262782c6f1 (2023-07-31T09:50:04Z).
revision: b9af56cee792f17a466db7b3ac3382262782c6f1
release: ac8474a5929e9de3bce84f16f8c589240eb9f7c4 (2023-08-03T12:13:06Z).
revision: ac8474a5929e9de3bce84f16f8c589240eb9f7c4
vendoring:
url: https://github.com/mozilla/cubeb

Просмотреть файл

@ -11,7 +11,6 @@
#include "cubeb_resampler.h"
#include "cubeb_triple_buffer.h"
#include <aaudio/AAudio.h>
#include <android/api-level.h>
#include <atomic>
#include <cassert>
#include <chrono>
@ -1260,14 +1259,14 @@ aaudio_stream_init(cubeb * ctx, cubeb_stream ** stream,
// This is ok: the thread is marked as being in use
lock.unlock();
lock_guard guard(stm->mutex);
int err;
{
lock_guard guard(stm->mutex);
err = aaudio_stream_init_impl(stm, guard);
}
int err = aaudio_stream_init_impl(stm, guard);
if (err != CUBEB_OK) {
// This is needed since aaudio_stream_destroy will lock the mutex again.
// It's no problem that there is a gap in between as the stream isn't
// actually in use.
lock.unlock();
aaudio_stream_destroy(stm);
return err;
}
@ -1705,9 +1704,6 @@ const static struct cubeb_ops aaudio_ops = {
extern "C" /*static*/ int
aaudio_init(cubeb ** context, char const * /* context_name */)
{
if (android_get_device_api_level() <= 30) {
return CUBEB_ERROR;
}
// load api
void * libaaudio = nullptr;
#ifndef DISABLE_LIBAAUDIO_DLOPEN