diff options
Diffstat (limited to 'lib/avtp_pipeline/include')
| -rw-r--r-- | lib/avtp_pipeline/include/avb_sched.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_audio_pub.h | 17 | ||||
| -rwxr-xr-x | lib/avtp_pipeline/include/openavb_intf_pub.h | 28 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_log.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_log_pub.h | 80 | ||||
| -rwxr-xr-x | lib/avtp_pipeline/include/openavb_map_pub.h | 19 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_platform.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_platform_pub.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_pub.h | 13 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_trace.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_trace_pub.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_types.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_types_base.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_types_base_pub.h | 1 | ||||
| -rw-r--r-- | lib/avtp_pipeline/include/openavb_types_pub.h | 1 |
15 files changed, 97 insertions, 70 deletions
diff --git a/lib/avtp_pipeline/include/avb_sched.h b/lib/avtp_pipeline/include/avb_sched.h index a4c7106c..5eaa3e81 100644 --- a/lib/avtp_pipeline/include/avb_sched.h +++ b/lib/avtp_pipeline/include/avb_sched.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_audio_pub.h b/lib/avtp_pipeline/include/openavb_audio_pub.h index 769481ff..1e50d45a 100644 --- a/lib/avtp_pipeline/include/openavb_audio_pub.h +++ b/lib/avtp_pipeline/include/openavb_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,10 +22,10 @@ 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. *************************************************************************************************************/ @@ -50,6 +51,8 @@ typedef enum { AVB_AUDIO_RATE_16KHZ = 16000, /// 22050 AVB_AUDIO_RATE_22_05KHZ = 22050, + /// 24000 + AVB_AUDIO_RATE_24KHZ = 24000, /// 32000 AVB_AUDIO_RATE_32KHZ = 32000, /// 44100 diff --git a/lib/avtp_pipeline/include/openavb_intf_pub.h b/lib/avtp_pipeline/include/openavb_intf_pub.h index 5b57c033..fea0ffb1 100755 --- a/lib/avtp_pipeline/include/openavb_intf_pub.h +++ b/lib/avtp_pipeline/include/openavb_intf_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 @@ -65,20 +66,6 @@ typedef void (*openavb_intf_cfg_cb_t)(media_q_t *pMediaQ, const char *name, cons */ typedef void (*openavb_intf_gen_init_cb_t)(media_q_t *pMediaQ); -/** AVDECC initialize callback for both a talker or listener. - * - * Entity model based configuration can be processed at this time. - * This callback is optional and only executed when AVDECC is used to connect - * streams. - * - * \param pMediaQ A pointer to the media queue for this stream - * \param configIdx current configuration descriptor index for the Entity Model - * \param descriptorType The descriptorType is expected to be of STREAM_INPUT - * for listeners and STREAM_OUTPUT for talkers. - * \param descriptorIdx descriptor index in the Entity Model - */ -typedef void (*openavb_intf_avdecc_init_cb_t)(media_q_t *pMediaQ, U16 configIdx, U16 descriptorType, U16 descriptorIdx); - /** Initialize transmit callback into the interface module. * * This callback function is called anytime a stream reservation has completed @@ -170,6 +157,15 @@ typedef void (*openavb_intf_gen_end_cb_t)(media_q_t *pMediaQ); */ typedef unsigned int (*openavb_intf_get_src_bitrate_t)(media_q_t *pMediaQ); +/** Inform interface about stream_uid. + * + * Will be used for logging to distinguish information logged from different streams + * using the same interface. + * \param pMediaQ A pointer to the media queue for this stream + * \param stream_uid stream unique ID (last two bytes of streamID) + */ +typedef void (*openavb_intf_set_stream_uid_t)(media_q_t *pMediaQ, U16 stream_uid); + /** Enable fixed timestamping in interface. * * Everytime interface needs to set media_q_item_t.pAvtpTime it calls openavbAvtpTimeSetToWallTime() to set. @@ -199,8 +195,6 @@ typedef struct { openavb_intf_cfg_cb_t intf_cfg_cb; /// General initialize callback. openavb_intf_gen_init_cb_t intf_gen_init_cb; - /// AVDECC initialize callback. - openavb_intf_avdecc_init_cb_t intf_avdecc_init_cb; /// Initialize transmit callback. openavb_intf_tx_init_cb_t intf_tx_init_cb; /// Transmit callback. @@ -219,6 +213,8 @@ typedef struct { void * intf_host_cb_list; /// Source bit rate callback. openavb_intf_get_src_bitrate_t intf_get_src_bitrate_cb; + /// Callback for setting stream uid + openavb_intf_set_stream_uid_t intf_set_stream_uid_cb; /// Enable fixed timestamp callback openavb_intf_enable_fixed_timestamp intf_enable_fixed_timestamp; } openavb_intf_cb_t; diff --git a/lib/avtp_pipeline/include/openavb_log.h b/lib/avtp_pipeline/include/openavb_log.h index d5069111..fbcc91f2 100644 --- a/lib/avtp_pipeline/include/openavb_log.h +++ b/lib/avtp_pipeline/include/openavb_log.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_log_pub.h b/lib/avtp_pipeline/include/openavb_log_pub.h index 9ae5f1e0..846c169e 100644 --- a/lib/avtp_pipeline/include/openavb_log_pub.h +++ b/lib/avtp_pipeline/include/openavb_log_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,16 +22,16 @@ 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. *************************************************************************************************************/ /* * MODULE SUMMARY : A simple logging facility for use during -* development. +* development. */ #ifndef OPENAVB_LOG_PUB_H @@ -122,11 +123,11 @@ static const bool OPENAVB_LOG_THREAD_INFO = FALSE; //#define AVB_LOG_OUTPUT_FD stdout // When OPENAVB_LOG_FROM_THREAD the message output will be output from a separate thread/task -// Primary intended use is for debugging. +// Primary intended use is for debugging. // It is expected that OPENAVB_LOG_PULL_MODE will not be used at the same time as this optoin. static const bool OPENAVB_LOG_FROM_THREAD = TRUE; -// When OPENAVB_LOG_PULL_MODE the messages will be queued and can be pulled using the +// When OPENAVB_LOG_PULL_MODE the messages will be queued and can be pulled using the // avbLogGetMsg() call. This could be from an logger interface module or host application. // It is expected that OPENAVB_LOG_FROM_THREAD will not be used at the same time as this option. static const bool OPENAVB_LOG_PULL_MODE = FALSE; @@ -159,19 +160,24 @@ typedef enum { #define LOG_VARX(x, y) x ## y #define LOG_VAR(x, y) LOG_VARX(x, y) -// Log a message once. Technically once every 4.2 billion attempts. Usage: LOG_ONCE AVB_LOG_INFO(...) -#define IF_LOG_ONCE() static U32 LOG_VAR(logOnce,__LINE__); if (!LOG_VAR(logOnce,__LINE__)++) +// Log a message once. Technically once every 4.2 billion attempts. Usage: IF_LOG_ONCE() AVB_LOG_INFO(...) +#define IF_LOG_ONCE() static U32 LOG_VAR(logOnce,__LINE__) = 0; if (!LOG_VAR(logOnce,__LINE__)++) -// Log a message at an interval. Usage: LOG_INTERVAL(100) AVB_LOG_INFO(...) -#define IF_LOG_INTERVAL(x) static U32 LOG_VAR(logOnce,__LINE__); if (!(LOG_VAR(logOnce,__LINE__)++ % (x - 1))) +// Log a message at an interval. Usage: IF_LOG_INTERVAL(100) AVB_LOG_INFO(...) +#define IF_LOG_INTERVAL(x) static U32 LOG_VAR(logOnce,__LINE__) = 0; if (!(LOG_VAR(logOnce,__LINE__)++ % (x))) #define ETH_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x" #define ETH_OCTETS(a) (a)[0],(a)[1],(a)[2],(a)[3],(a)[4],(a)[5] -#define STREAMID_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x/%d" +#define STREAMID_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x/%u" #define STREAMID_ARGS(s) (s)->addr[0],(s)->addr[1],(s)->addr[2],(s)->addr[3],(s)->addr[4],(s)->addr[5],(s)->uniqueID +#define ENTITYID_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" +#define ENTITYID_ARGS(a) (a)[0],(a)[1],(a)[2],(a)[3],(a)[4],(a)[5],(a)[6],(a)[7] + +void avbLogInitEx(FILE *file); + void avbLogInit(void); void avbLogExit(void); @@ -188,12 +194,34 @@ void avbLogFn( void avbLogRT(int level, bool bBegin, bool bItem, bool bEnd, char *pFormat, log_rt_datatype_t dataType, void *pVar); +void avbLogBuffer( + int level, + const U8 *pData, + int dataLen, + int lineLen, + const char *company, + const char *component, + const char *path, + int line); + #define avbLogFn2(level, tag, company, component, path, line, fmt, ...) \ - ({\ + {\ if (level <= AVB_LOG_LEVEL) \ avbLogFn(0, tag, company, component, path, line, fmt, __VA_ARGS__); \ - }) + } + +#define avbLogRT2(level, bBegin, bItem, bEnd, pFormat, dataType, pVar) \ + {\ + if (level <= AVB_LOG_LEVEL) \ + avbLogRT(0, bBegin, bItem, bEnd, pFormat, dataType, pVar); \ + } + +#define avbLogBuffer2(level, pData, dataLen, lineLen, company, component, path, line) \ + {\ + if (level <= AVB_LOG_LEVEL) \ + avbLogBuffer(0, pData, dataLen, lineLen, company, component, path, line); \ + } #ifdef AVB_LOG_ON #define AVB_LOGF_DEV(LEVEL, FMT, ...) avbLogFn2(LEVEL, "DEV", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, FMT, __VA_ARGS__) @@ -203,19 +231,20 @@ void avbLogRT(int level, bool bBegin, bool bItem, bool bEnd, char *pFormat, log_ #define AVB_LOGF_STATUS(FMT, ...) avbLogFn2(AVB_LOG_LEVEL_STATUS, "STATUS", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, FMT, __VA_ARGS__) #define AVB_LOGF_DEBUG(FMT, ...) avbLogFn2(AVB_LOG_LEVEL_DEBUG, "DEBUG", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, FMT, __VA_ARGS__) #define AVB_LOGF_VERBOSE(FMT, ...) avbLogFn2(AVB_LOG_LEVEL_VERBOSE, "VERBOSE", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, FMT, __VA_ARGS__) -#define AVB_LOG_DEV(LEVEL, FMT, ...) avbLogFn2(LEVEL, "DEV", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, FMT, __VA_ARGS__) +#define AVB_LOG_DEV(LEVEL, MSG) avbLogFn2(LEVEL, "DEV", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) #define AVB_LOG_ERROR(MSG) avbLogFn2(AVB_LOG_LEVEL_ERROR, "ERROR", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) #define AVB_LOG_WARNING(MSG) avbLogFn2(AVB_LOG_LEVEL_WARNING, "WARNING", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) #define AVB_LOG_INFO(MSG) avbLogFn2(AVB_LOG_LEVEL_INFO, "INFO", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) #define AVB_LOG_STATUS(MSG) avbLogFn2(AVB_LOG_LEVEL_STATUS, "STATUS", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) #define AVB_LOG_DEBUG(MSG) avbLogFn2(AVB_LOG_LEVEL_DEBUG, "DEBUG", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) #define AVB_LOG_VERBOSE(MSG) avbLogFn2(AVB_LOG_LEVEL_VERBOSE, "VERBOSE", AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__, "%s", MSG) -#define AVB_LOGRT_ERROR(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT(AVB_LOG_LEVEL_ERROR, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define AVB_LOGRT_WARNING(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT(AVB_LOG_LEVEL_WARNING, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define AVB_LOGRT_INFO(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT(AVB_LOG_LEVEL_INFO, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define AVB_LOGRT_STATUS(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT(AVB_LOG_LEVEL_STATUS, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define AVB_LOGRT_DEBUG(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT(AVB_LOG_LEVEL_DEBUG, BEGIN, ITEM, END, FMT, TYPE, VAL) -#define AVB_LOGRT_VERBOSE(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT(AVB_LOG_LEVEL_VERBOSE, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOGRT_ERROR(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT2(AVB_LOG_LEVEL_ERROR, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOGRT_WARNING(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT2(AVB_LOG_LEVEL_WARNING, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOGRT_INFO(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT2(AVB_LOG_LEVEL_INFO, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOGRT_STATUS(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT2(AVB_LOG_LEVEL_STATUS, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOGRT_DEBUG(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT2(AVB_LOG_LEVEL_DEBUG, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOGRT_VERBOSE(BEGIN, ITEM, END, FMT, TYPE, VAL) avbLogRT2(AVB_LOG_LEVEL_VERBOSE, BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOG_BUFFER(LEVEL, DATA, DATALEN, LINELINE) avbLogBuffer2(LEVEL, DATA, DATALEN, LINELINE, AVB_LOG_COMPANY, AVB_LOG_COMPONENT, __FILE__, __LINE__) #else #define AVB_LOGF_DEV(LEVEL, FMT, ...) #define AVB_LOGF_ERROR(FMT, ...) @@ -237,9 +266,10 @@ void avbLogRT(int level, bool bBegin, bool bItem, bool bEnd, char *pFormat, log_ #define AVB_LOGRT_STATUS(BEGIN, ITEM, END, FMT, TYPE, VAL) #define AVB_LOGRT_DEBUG(BEGIN, ITEM, END, FMT, TYPE, VAL) #define AVB_LOGRT_VERBOSE(BEGIN, ITEM, END, FMT, TYPE, VAL) +#define AVB_LOG_BUFFER(LEVEL, DATA, DATALEN, LINELINE) #endif // AVB_LOG_ON -// Get a queued log message. Intended to be used with the OPENAVB_LOG_PULL_MODE option. +// Get a queued log message. Intended to be used with the OPENAVB_LOG_PULL_MODE option. // Message will not be null terminated. U32 avbLogGetMsg(U8 *pBuf, U32 bufSize); diff --git a/lib/avtp_pipeline/include/openavb_map_pub.h b/lib/avtp_pipeline/include/openavb_map_pub.h index ff5e2a72..02a58957 100755 --- a/lib/avtp_pipeline/include/openavb_map_pub.h +++ b/lib/avtp_pipeline/include/openavb_map_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 @@ -103,22 +104,6 @@ typedef U32(*openavb_map_transmit_interval_cb_t)(media_q_t *pMediaQ); */ typedef void (*openavb_map_gen_init_cb_t)(media_q_t *pMediaQ); -/** AVDECC initialize callback for both a talker or listener. - * - * Entity model based configuration can be processed at this time. This - * callback is optional and only executed when AVDECC is used to connect - * streams. The descriptorType is expected to be of STREAM_INPUT for listeners - * and STREAM_OUTPUT for talkers. - * - * \param pMediaQ A pointer to the media queue for this stream - * \param configIdx current configuration descriptor index for the Entity Model - * \param descriptorType The descriptorType is expected to be of STREAM_INPUT - * for listeners and STREAM_OUTPUT for talkers. - * \param descriptorIdx descriptor index in the Entity Model - * \see openavb_intf_avdecc_init_cb_t - */ -typedef void (*openavb_map_avdecc_init_cb_t)(media_q_t *pMediaQ, U16 configIdx, U16 descriptorType, U16 descriptorIdx); - /** A call to this callback indicates that this mapping module will be a talker. * * Any talker initialization can be done in this function. @@ -207,8 +192,6 @@ typedef struct { openavb_map_transmit_interval_cb_t map_transmit_interval_cb; /// General initialize callback. openavb_map_gen_init_cb_t map_gen_init_cb; - /// AVDECC initialize callback. - openavb_map_avdecc_init_cb_t map_avdecc_init_cb; /// Initialize transmit callback. openavb_map_tx_init_cb_t map_tx_init_cb; /// Transmit callback. diff --git a/lib/avtp_pipeline/include/openavb_platform.h b/lib/avtp_pipeline/include/openavb_platform.h index fb079d51..52a222ec 100644 --- a/lib/avtp_pipeline/include/openavb_platform.h +++ b/lib/avtp_pipeline/include/openavb_platform.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_platform_pub.h b/lib/avtp_pipeline/include/openavb_platform_pub.h index 8be98866..1d91cc5b 100644 --- a/lib/avtp_pipeline/include/openavb_platform_pub.h +++ b/lib/avtp_pipeline/include/openavb_platform_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_pub.h b/lib/avtp_pipeline/include/openavb_pub.h index 1f67f10e..9e530cef 100644 --- a/lib/avtp_pipeline/include/openavb_pub.h +++ b/lib/avtp_pipeline/include/openavb_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 @@ -42,13 +43,15 @@ https://github.com/benhoyt/inih/commit/74d2ca064fb293bc60a77b0bd068075b293cf175. // // These must NOT be edited for project related work ///////////////////////////////////////////////////////// -#define AVB_CORE_NAME "AVTP Pipeline" +#if defined(AVB_FEATURE_AVDECC) && (AVB_FEATURE_AVDECC) + #define AVB_CORE_NAME "AVTP AVDECC" +#else + #define AVB_CORE_NAME "AVTP Pipeline" +#endif #define AVB_CORE_VER_MAJOR (0) #define AVB_CORE_VER_MINOR (1) -#define AVB_CORE_VER_REVISION (0) - -#define AVB_CORE_VER_FULL (AVB_CORE_VER_MAJOR << 16 | AVB_CORE_VER_MINOR << 8 | AVB_CORE_VER_REVISION) +#define AVB_CORE_VER_REVISION (3) // Standard release designations. Uncomment one AVB_RELEASE_TYPE #define AVB_CORE_RELEASE_TYPE "Development" @@ -56,6 +59,8 @@ https://github.com/benhoyt/inih/commit/74d2ca064fb293bc60a77b0bd068075b293cf175. //#define AVB_CORE_RELEASE_TYPE "Beta" //#define AVB_CORE_RELEASE_TYPE "Release" +#define AVB_CORE_VER_FULL (AVB_CORE_VER_MAJOR << 16 | AVB_CORE_VER_MINOR << 8 | AVB_CORE_VER_REVISION) + #define LOG_EAVB_CORE_VERSION() AVB_LOGF_INFO("%s: %i.%i.%i (%s)", AVB_CORE_NAME, AVB_CORE_VER_MAJOR, AVB_CORE_VER_MINOR, AVB_CORE_VER_REVISION, AVB_CORE_RELEASE_TYPE) diff --git a/lib/avtp_pipeline/include/openavb_trace.h b/lib/avtp_pipeline/include/openavb_trace.h index fd58cde6..759d55ae 100644 --- a/lib/avtp_pipeline/include/openavb_trace.h +++ b/lib/avtp_pipeline/include/openavb_trace.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_trace_pub.h b/lib/avtp_pipeline/include/openavb_trace_pub.h index c90a83d3..c5ba1ac6 100644 --- a/lib/avtp_pipeline/include/openavb_trace_pub.h +++ b/lib/avtp_pipeline/include/openavb_trace_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_types.h b/lib/avtp_pipeline/include/openavb_types.h index c042c24c..9a33fc4d 100644 --- a/lib/avtp_pipeline/include/openavb_types.h +++ b/lib/avtp_pipeline/include/openavb_types.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_types_base.h b/lib/avtp_pipeline/include/openavb_types_base.h index 1a3e2628..1edf2d0d 100644 --- a/lib/avtp_pipeline/include/openavb_types_base.h +++ b/lib/avtp_pipeline/include/openavb_types_base.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_types_base_pub.h b/lib/avtp_pipeline/include/openavb_types_base_pub.h index 1d03e80a..4f86364a 100644 --- a/lib/avtp_pipeline/include/openavb_types_base_pub.h +++ b/lib/avtp_pipeline/include/openavb_types_base_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 diff --git a/lib/avtp_pipeline/include/openavb_types_pub.h b/lib/avtp_pipeline/include/openavb_types_pub.h index 02e61466..da58b211 100644 --- a/lib/avtp_pipeline/include/openavb_types_pub.h +++ b/lib/avtp_pipeline/include/openavb_types_pub.h @@ -1,5 +1,6 @@ /************************************************************************************************************* 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 |