Changeset 715 for branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp
- Timestamp:
- 11/11/07 10:12:01 (16 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp
r714 r715 24 24 #include "AmdtpTransmitStreamProcessor.h" 25 25 #include "AmdtpPort.h" 26 #include "../StreamProcessorManager.h" 26 27 27 28 #include "../util/cycletimer.h" … … 40 41 41 42 /* transmit */ 42 AmdtpTransmitStreamProcessor::AmdtpTransmitStreamProcessor(int port, int framerate, intdimension)43 : StreamProcessor(ePT_Transmit, port , framerate)43 AmdtpTransmitStreamProcessor::AmdtpTransmitStreamProcessor(int port, int dimension) 44 : StreamProcessor(ePT_Transmit, port) 44 45 , m_dimension(dimension) 45 46 , m_last_timestamp(0) … … 446 447 } 447 448 448 switch (m_ framerate) {449 switch (m_manager->getNominalRate()) { 449 450 case 32000: 450 451 m_syt_interval = 8; … … 482 483 IEC61883_FMT_AMDTP, 483 484 m_fdf, 484 m_ framerate,485 m_manager->getNominalRate(), 485 486 m_dimension, 486 487 m_syt_interval); 487 488 488 489 // prepare the framerate estimate 489 float ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_ framerate);490 float ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_manager->getNominalRate()); 490 491 m_ticks_per_frame=ticks_per_frame; 491 492 492 493 // initialize internal buffer 493 m_ringbuffer_size_frames=m_ nb_buffers * m_period;494 m_ringbuffer_size_frames=m_manager->getNbBuffers() * m_manager->getPeriodSize(); 494 495 495 496 assert(m_data_buffer); … … 498 499 m_data_buffer->setEventsPerFrame(m_dimension); 499 500 500 m_data_buffer->setUpdatePeriod(m_ period);501 m_data_buffer->setUpdatePeriod(m_manager->getPeriodSize()); 501 502 m_data_buffer->setNominalRate(ticks_per_frame); 502 503 … … 513 514 { 514 515 debugOutput(DEBUG_LEVEL_VERBOSE, "Setting up port %s\n",(*it)->getName().c_str()); 515 if(!(*it)->setBufferSize(m_ period)) {516 debugFatal("Could not set buffer size to %d\n",m_ period);516 if(!(*it)->setBufferSize(m_manager->getPeriodSize())) { 517 debugFatal("Could not set buffer size to %d\n",m_manager->getPeriodSize()); 517 518 return false; 518 519 } … … 599 600 debugOutput( DEBUG_LEVEL_VERBOSE, "Prepared for:\n"); 600 601 debugOutput( DEBUG_LEVEL_VERBOSE, " Samplerate: %d, FDF: %d, DBS: %d, SYT: %d\n", 601 m_ framerate,m_fdf,m_dimension,m_syt_interval);602 m_manager->getNominalRate(),m_fdf,m_dimension,m_syt_interval); 602 603 debugOutput( DEBUG_LEVEL_VERBOSE, " PeriodSize: %d, NbBuffers: %d\n", 603 m_ period,m_nb_buffers);604 m_manager->getPeriodSize(), m_manager->getNbBuffers()); 604 605 debugOutput( DEBUG_LEVEL_VERBOSE, " Port: %d, Channel: %d\n", 605 606 m_port,m_channel); … … 625 626 626 627 return true; 628 } 629 630 unsigned int 631 AmdtpTransmitStreamProcessor::getPacketsPerPeriod() 632 { 633 return (m_manager->getPeriodSize())/m_syt_interval; 627 634 } 628 635