Browse Source

adjusted ipg time

pull/450/head
Christoph Kuhr 7 years ago
parent
commit
14969323d6
2 changed files with 3 additions and 12 deletions
  1. +2
    -11
      linux/avb/JackAVBDriver.cpp
  2. +1
    -1
      linux/avb/avb_1722avtp.c

+ 2
- 11
linux/avb/JackAVBDriver.cpp View File

@@ -176,16 +176,7 @@ int JackAVBPDriver::Read()
int ret = 0;
JSList *node = ieee1722mc.capture_ports;


/*
*
* Even Odd Calc will cause xruns. cumulative_delay_ns must be calculated sample accurate in mediaclock listener
*
*/

//num_packets_even_odd ? num_packets_even_odd = 0 : num_packets_even_odd = 1; // even = 0, odd = 1
int num_packets = (int)( ieee1722mc.period_size / 6 ) + 1; // + num_packets_even_odd;

int num_packets = (int)( ieee1722mc.period_size / 6 ) + 1;

uint64_t cumulative_ipg_ns = 0;

@@ -194,7 +185,7 @@ int JackAVBPDriver::Read()
}


printf("ipg: %lld ns\n", cumulative_ipg_ns );fflush(stdout);
printf("ipg: %lld ns, period_usec: %lld\n", cumulative_ipg_ns, ieee1722mc.period_usecs );fflush(stdout);
float cumulative_ipg_us = cumulative_ipg_ns / 1000;
if ( cumulative_ipg_us > ieee1722mc.period_usecs) {
ret = 1;


+ 1
- 1
linux/avb/avb_1722avtp.c View File

@@ -486,7 +486,7 @@ int init_1722_driver( ieee1722_avtp_driver_state_t *ieee1722mc, const char* name
ieee1722mc->period_size = period_size;
ieee1722mc->period_usecs = (uint64_t) (period_size / sample_rate * 1000000);

printf("sample_rate: %d, period size: %d, period usec: %d\n",ieee1722mc->sample_rate, ieee1722mc->period_size, ieee1722mc->period_usecs);fflush(filepointer);
fprintf(filepointer,"sample_rate: %d, period size: %d, period usec: %lld\n",ieee1722mc->sample_rate, ieee1722mc->period_size, ieee1722mc->period_usecs);fflush(filepointer);

if( RETURN_VALUE_FAILURE == create_avb_Mediaclock_Listener(filepointer, &ieee1722mc, name,
stream_id, destination_mac,


Loading…
Cancel
Save