Conversation
…F Stream to entity model.
…ork audiomaps to enable CRF connection management!
…ed setting of clock source. TODO: Make Media clock server use the correct buffer!
…e received by media clock server now.
…lcualte baselength.
| @@ -1,4 +1,4 @@ | |||
| #define AVB_1722_1_ENTITY_NAME_STRING "xCORE-200 MC Audio" | |||
There was a problem hiding this comment.
Here should be using the @varname@ format to change it at configure time
| @@ -1,4 +1,4 @@ | |||
| #define AVB_1722_1_ENTITY_NAME_STRING "xCORE-200 MC Audio" | |||
| #define AVB_1722_1_ENTITY_NAME_STRING "xCORE-200 Milan" | |||
There was a problem hiding this comment.
Here should be using the @varname@ format to change it at configure time / Same as the previous comment
| #define AEM_GENERATE_DESCRIPTORS_ON_FLY 0 | ||
| #define AVB_1722_1_AEM_ENABLED 1 | ||
| #define AVB_ENABLE_1722_1 1 | ||
|
|
There was a problem hiding this comment.
Use a configure fine h.in to generate at configure time
There was a problem hiding this comment.
Something like:
#define AEM_GENERATE_DESCRIPTORS_ON_FLY @@AEM_GENERATE_DESCRIPTORS_ON_FLY@@
#define AVB_1722_1_AEM_ENABLED @@AVB_1722_1_AEM_ENABLED@@
#define AVB_ENABLE_1722_1 @@AVB_ENABLE_1722_1@@
|
|
||
| /** Use 61883-6 audio format for 1722 streams */ | ||
| #define AVB_1722_FORMAT_61883_6 1 | ||
| #define AVB_1722_FORMAT_AAF 1 |
There was a problem hiding this comment.
Use a configure fine h.in to generate at configure time (e.g see previous example)
| null, | ||
| c_listener_ctl[0], | ||
| AVB_NUM_SINKS, | ||
| 2, /* 1 Audio + 1 CRF*/ |
There was a problem hiding this comment.
Use a configure fine h.in to generate at configure time (e.g see previous example)
| #define AVB_STREAM_TABLE_ENTRIES (AVB_NUM_SOURCES+AVB_NUM_SINKS+1+4)//+1 CRF Stream | ||
| #else | ||
| #define AVB_STREAM_TABLE_ENTRIES (8+AVB_NUM_SOURCES+AVB_NUM_SINKS+4) | ||
| #define AVB_STREAM_TABLE_ENTRIES (8+AVB_NUM_SOURCES+AVB_NUM_SINKS+1+4)//+1 CRF Stream |
There was a problem hiding this comment.
Create specific defined / or get the value from a context
| } | ||
|
|
||
| for (int i=0; i < AVB_NUM_SINKS; i++) | ||
| for (int i=0; i < AVB_NUM_SINKS+1; i++)//+1 CRF Stream |
There was a problem hiding this comment.
Create specific defined / or get the value from a context
|
|
||
| struct output_finfo { | ||
| unsigned int *unsafe p_buffer[AVB_NUM_MEDIA_OUTPUTS]; | ||
| unsigned int *unsafe p_buffer[AVB_NUM_MEDIA_OUTPUTS+1]; // +1 for CRF |
There was a problem hiding this comment.
Create specific defined / or get the value from a context
|
|
||
| #ifndef AVB_1722_1_MAX_LISTENERS | ||
| #define AVB_1722_1_MAX_LISTENERS AVB_NUM_SINKS | ||
| #define AVB_1722_1_MAX_LISTENERS (AVB_NUM_SINKS+1) //+1 CRF Stream |
There was a problem hiding this comment.
Create specific defined / or get the value from a context
|
|
||
| #ifndef AVB_1722_1_ADP_LISTENER_STREAM_SINKS | ||
| #define AVB_1722_1_ADP_LISTENER_STREAM_SINKS AVB_NUM_SINKS | ||
| #define AVB_1722_1_ADP_LISTENER_STREAM_SINKS (AVB_NUM_SINKS+1) //+1 CRF Stream |
There was a problem hiding this comment.
Create specific defined / or get the value from a context
| static unsigned long long calculate_wordlen(unsigned int sample_rate) { | ||
| const unsigned long long nanoseconds = (100000000LL << WORDLEN_FRACTIONAL_BITS); | ||
| const unsigned long long nanoseconds = (100000000LL << WORDLEN_FRACTIONAL_BITS); // 100000000 ticks per seconds for a 100MHz clock? | ||
| /* Calculate what master clock we should be using */ |
There was a problem hiding this comment.
Coming back to the master version
2 participants
No description provided.