avs-device-sdk/AVSCommon/Utils/src/FormattedAudioStreamAdapter...

78 lines
2.3 KiB
C++
Raw Normal View History

Version 1.7.1 alexa-client-sdk Changes in this update: Enhancements * Added the Bluetooth interface, which manages the Bluetooth connection between Alexa-enabled products and peer devices. This release supports A2DP-SINK and AVRCP profiles. Note: Bluetooth is optional and is currently limited to Raspberry Pi and Linux platforms. * Added new Bluetooth dependencies for Linux and Raspberry Pi. * Device Capability Framework (DCF) renamed to Capabilities. * Updated the non-CBL client ID error message to be more specific. * Updated the sample app to enter a limited interaction mode after an unrecoverable error. Bug Fixes * Issue 597 - Fixed a bug where the sample app did not respond to locale change settings. * Fixed issue where GStreamer 1.14 MediaPlayerTest failed on Windows. * Fixed an issue where a segmentation fault was triggered after unrecoverable error handling. Known Issues * The ACL may encounter issues if audio attachments are received but not consumed. * SpeechSynthesizerState currently uses GAINING_FOCUS and LOSING_FOCUS as a workaround for handling intermediate state. These states may be removed in a future release. * The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth. * Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback. * When streaming silence via Bluetooth, the Alexa companion app will sometimes indicate that media content is streaming. * The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported. * On some products, interrupted Bluetooth playback may not resume if other content is locally streamed. * When streaming content via Bluetooth, under certain conditions playback will fail to resume and the sample app hangs on exit. This is due to a conflict between the GStreamer pipeline and the Bluetooth agent. * On Raspberry Pi, when streaming audio via Bluetooth, sometimes the audio stream stutters. * On Raspberry Pi, BlueALSA must be terminated each time the device boots. See Raspberry Pi Quick Start Guide for more information.
2018-05-04 22:45:54 +00:00
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
Version 1.7.1 alexa-client-sdk Changes in this update: Enhancements * Added the Bluetooth interface, which manages the Bluetooth connection between Alexa-enabled products and peer devices. This release supports A2DP-SINK and AVRCP profiles. Note: Bluetooth is optional and is currently limited to Raspberry Pi and Linux platforms. * Added new Bluetooth dependencies for Linux and Raspberry Pi. * Device Capability Framework (DCF) renamed to Capabilities. * Updated the non-CBL client ID error message to be more specific. * Updated the sample app to enter a limited interaction mode after an unrecoverable error. Bug Fixes * Issue 597 - Fixed a bug where the sample app did not respond to locale change settings. * Fixed issue where GStreamer 1.14 MediaPlayerTest failed on Windows. * Fixed an issue where a segmentation fault was triggered after unrecoverable error handling. Known Issues * The ACL may encounter issues if audio attachments are received but not consumed. * SpeechSynthesizerState currently uses GAINING_FOCUS and LOSING_FOCUS as a workaround for handling intermediate state. These states may be removed in a future release. * The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth. * Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback. * When streaming silence via Bluetooth, the Alexa companion app will sometimes indicate that media content is streaming. * The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported. * On some products, interrupted Bluetooth playback may not resume if other content is locally streamed. * When streaming content via Bluetooth, under certain conditions playback will fail to resume and the sample app hangs on exit. This is due to a conflict between the GStreamer pipeline and the Bluetooth agent. * On Raspberry Pi, when streaming audio via Bluetooth, sometimes the audio stream stutters. * On Raspberry Pi, BlueALSA must be terminated each time the device boots. See Raspberry Pi Quick Start Guide for more information.
2018-05-04 22:45:54 +00:00
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
#include "AVSCommon/Utils/Bluetooth/FormattedAudioStreamAdapter.h"
#include "AVSCommon/Utils/Logger/Logger.h"
namespace alexaClientSDK {
namespace avsCommon {
namespace utils {
namespace bluetooth {
/// String to identify log entries originating from this file.
static const std::string TAG("FormattedAudioStreamAdapter");
/**
* Create a LogEntry using this file's TAG and the specified event string.
*
* @param The event string for this @c LogEntry.
*/
#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
FormattedAudioStreamAdapter::FormattedAudioStreamAdapter(const AudioFormat& audioFormat) {
// Some compilers fail to initialize AudioFormat structure with a curly brackets notation.
m_audioFormat = audioFormat;
}
AudioFormat FormattedAudioStreamAdapter::getAudioFormat() const {
return m_audioFormat;
}
void FormattedAudioStreamAdapter::setListener(std::shared_ptr<FormattedAudioStreamAdapterListener> listener) {
std::lock_guard<std::mutex> guard(m_readerFunctionMutex);
m_listener = listener;
}
size_t FormattedAudioStreamAdapter::send(const unsigned char* buffer, size_t size) {
if (!buffer) {
ACSDK_ERROR(LX("sendFailed").d("reason", "buffer is null"));
return 0;
}
if (0 == size) {
ACSDK_ERROR(LX("sendFailed").d("reason", "size is 0"));
return 0;
}
std::shared_ptr<FormattedAudioStreamAdapterListener> listener;
{
std::lock_guard<std::mutex> guard(m_readerFunctionMutex);
listener = m_listener.lock();
}
if (listener) {
listener->onFormattedAudioStreamAdapterData(m_audioFormat, buffer, size);
return size;
} else {
return 0;
}
}
} // namespace bluetooth
} // namespace utils
} // namespace avsCommon
} // namespace alexaClientSDK