diff options
Diffstat (limited to 'lib/avtp_pipeline/map_uncmp_audio/openavb_map_uncmp_audio_pub.h')
| -rwxr-xr-x | lib/avtp_pipeline/map_uncmp_audio/openavb_map_uncmp_audio_pub.h | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/lib/avtp_pipeline/map_uncmp_audio/openavb_map_uncmp_audio_pub.h b/lib/avtp_pipeline/map_uncmp_audio/openavb_map_uncmp_audio_pub.h index 7a324d46..aab1f973 100755 --- a/lib/avtp_pipeline/map_uncmp_audio/openavb_map_uncmp_audio_pub.h +++ b/lib/avtp_pipeline/map_uncmp_audio/openavb_map_uncmp_audio_pub.h @@ -1,16 +1,17 @@ /************************************************************************************************************* Copyright (c) 2012-2015, Symphony Teleca Corporation, a Harman International Industries, Incorporated company +Copyright (c) 2016-2017, Harman International Industries, Incorporated All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS LISTED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -21,20 +22,20 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Attributions: The inih library portion of the source code is licensed from -Brush Technology and Ben Hoyt - Copyright (c) 2009, Brush Technology and Copyright (c) 2009, Ben Hoyt. -Complete license and copyright information can be found at + +Attributions: The inih library portion of the source code is licensed from +Brush Technology and Ben Hoyt - Copyright (c) 2009, Brush Technology and Copyright (c) 2009, Ben Hoyt. +Complete license and copyright information can be found at https://github.com/benhoyt/inih/commit/74d2ca064fb293bc60a77b0bd068075b293cf175. *************************************************************************************************************/ /* * HEADER SUMMARY : Uncompressed Audio mapping module public interface -* +* * Refer to IEC 61883-6 for details of the "source packet" structure. -* +* * The protocol_specific_header and CIP header. -* +* * map_nv_tx_rate must be set in the .ini file. */ @@ -59,19 +60,6 @@ https://github.com/benhoyt/inih/commit/74d2ca064fb293bc60a77b0bd068075b293cf175. */ #define MapUncmpAudioMediaQDataFormat "UncmpAudio" -/** Defines AAF timestamping mode: - * - TS_SPARSE_MODE_DISABLED - timestamp is valid in every avtp packet - * - TS_SPARSE_MODE_ENABLED - timestamp is valid in every 8th avtp packet - */ -typedef enum { - /// Unspecified - TS_SPARSE_MODE_UNSPEC = 0, - /// Disabled - TS_SPARSE_MODE_DISABLED = 1, - /// Enabled - TS_SPARSE_MODE_ENABLED = 8 -} avb_audio_sparse_mode_t; - /** Contains detailed information of the audio format. * \note Interface module has to set during the RX and TX init callbacks: * - audioRate, @@ -79,7 +67,6 @@ typedef enum { * - audioBitDepth, * - audioEndian, * - audioChannels, - * - sparseMode. * \note The rest of fields mapping module will set these during the RX and TX * init callbacks. The interface module can use these during the RX and TX * callbacks. @@ -95,8 +82,6 @@ typedef struct { avb_audio_endian_t audioEndian; /// Number of channels avb_audio_channels_t audioChannels; - /// Sparse timestamping mode - avb_audio_sparse_mode_t sparseMode; // The mapping module will set these during the RX and TX init callbacks // The interface module can use these during the RX and TX callbacks. @@ -121,12 +106,12 @@ typedef struct { /// synchronization time interval U32 sytInterval; - /// CB for interface modules to do translations in place before data is moved into the mediaQ on rx. + /// CB for interface modules to do translations in place before data is moved into the mediaQ on rx. openavb_intf_rx_translate_cb_t intf_rx_translate_cb; /// Interface Module may set this presentation latency which listener mapping modules will use to adjust the presetnation time S32 presentationLatencyUSec; - + } media_q_pub_map_uncmp_audio_info_t; #endif // OPENAVB_MAP_UNCMP_AUDIO_PUB_H |