Changeset 1419

Show
Ignore:
Timestamp:
11/06/08 14:28:57 (12 years ago)
Author:
jwoithe
Message:

Remove unused and unneeded (according to Pieter on 25 Sept 2008) getAveragePacketSize() method.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

    r1344 r1419  
    6767} 
    6868 
    69 unsigned int 
    70 AmdtpReceiveStreamProcessor::getAveragePacketSize() 
    71 { 
    72     // in one second we have 8000 packets 
    73     // containing FRAMERATE frames of m_dimension quadlets 
    74     // so 8000 packet headers + FRAMERATE*m_dimension quadlets 
    75     unsigned int one_second = 8000 * 2 * sizeof(quadlet_t) + m_StreamProcessorManager.getNominalRate() * m_dimension * sizeof(quadlet_t); 
    76     return one_second / 8000; 
    77 } 
    78  
    7969bool AmdtpReceiveStreamProcessor::prepareChild() { 
    8070    debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing (%p)...\n", this); 
  • branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h

    r1344 r1419  
    9090    virtual unsigned int getMaxPacketSize()  
    9191                    {return 4 * (2 + getSytInterval() * m_dimension);}; 
    92     virtual unsigned int getAveragePacketSize(); 
    9392    virtual unsigned int getEventsPerFrame()  
    9493                    { return m_dimension; }; 
  • branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

    r1379 r1419  
    406406            return 0; 
    407407    } 
    408 } 
    409  
    410 unsigned int 
    411 AmdtpTransmitStreamProcessor::getAveragePacketSize() 
    412 { 
    413     // in one second we have 8000 packets 
    414     // containing FRAMERATE frames of m_dimension quadlets 
    415     // so 8000 packet headers + FRAMERATE*m_dimension quadlets 
    416     unsigned int one_second = 8000 * 2 * sizeof(quadlet_t) + m_StreamProcessorManager.getNominalRate() * m_dimension * sizeof(quadlet_t); 
    417     return one_second / 8000; 
    418408} 
    419409 
  • branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h

    r1344 r1419  
    104104    virtual unsigned int getMaxPacketSize() 
    105105                    {return 4 * (2 + getSytInterval() * m_dimension);}; 
    106     virtual unsigned int getAveragePacketSize(); 
    107106    virtual unsigned int getEventsPerFrame() 
    108107                    { return m_dimension; }; 
  • branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h

    r1346 r1419  
    289289    virtual unsigned int getPacketsPerPeriod(); 
    290290    virtual unsigned int getMaxPacketSize() = 0; 
    291     virtual unsigned int getAveragePacketSize() = 0; 
    292291private: 
    293292    int m_channel; 
  • branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

    r1355 r1419  
    9696 
    9797unsigned int 
    98 MotuReceiveStreamProcessor::getAveragePacketSize() 
    99 { 
    100     // in one second we have 8000 packets 
    101     // containing FRAMERATE frames 
    102     // so on average bytes/packet: (8000 packet headers + FRAMERATE * frame_size) / 8000 
    103     #warning FIXME 
    104     int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate(); 
    105     return framerate<=48000?616:(framerate<=96000?1032:1160); 
    106 } 
    107  
    108 unsigned int 
    10998MotuReceiveStreamProcessor::getNominalFramesPerPacket() { 
    11099    int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate(); 
     
    279268                    *buffer = (*src_data<<16)+(*(src_data+1)<<8)+*(src_data+2); 
    280269                    // Sign-extend highest bit of 24-bit int. 
    281                     // FIXME: this isn't strictly needed since E_Int24 is a 24-bit, 
     270                    // This isn't strictly needed since E_Int24 is a 24-bit, 
    282271                    // but doing so shouldn't break anything and makes the data 
    283272                    // easier to deal with during debugging. 
  • branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.h

    r1344 r1419  
    152152                {return m_event_size;}; 
    153153    virtual unsigned int getMaxPacketSize(); 
    154     virtual unsigned int getAveragePacketSize(); 
    155154    virtual unsigned int getEventsPerFrame()  
    156                     { return 1; }; // FIXME: check 
     155                    { return 1; }; 
    157156    virtual unsigned int getNominalFramesPerPacket(); 
    158157 
  • branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

    r1363 r1419  
    8181 
    8282unsigned int 
    83 MotuTransmitStreamProcessor::getAveragePacketSize() 
    84 { 
    85     // in one second we have 8000 packets 
    86     // containing FRAMERATE frames 
    87     // so on average bytes/packet: (8000 packet headers + FRAMERATE * frame_size) / 8000 
    88     #warning FIXME 
    89     int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate(); 
    90     return framerate<=48000?616:(framerate<=96000?1032:1160); 
    91 } 
    92  
    93 unsigned int 
    9483MotuTransmitStreamProcessor::getNominalFramesPerPacket() { 
    9584    int framerate = m_Parent.getDeviceManager().getStreamProcessorManager().getNominalRate(); 
     
    687676            mb_head &= MIDIBUFFER_SIZE-1; 
    688677            if (unlikely(mb_head == mb_tail)) { 
    689             /* Buffer overflow - dump oldest byte */ 
    690             /* FIXME: ideally this would dump an entire MIDI message, but this is only 
     678            /* Buffer overflow - dump oldest byte. */ 
     679            /* Ideally this would dump an entire MIDI message, but this is only 
    691680             * feasible if it's possible to determine the message size easily. 
    692681             */ 
  • branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.h

    r1344 r1419  
    7676                {return m_event_size;}; 
    7777    virtual unsigned int getMaxPacketSize(); 
    78     virtual unsigned int getAveragePacketSize(); 
    7978    virtual unsigned int getEventsPerFrame()  
    80                     { return 1; }; // FIXME: check 
     79                    { return 1; }; 
    8180    virtual unsigned int getNominalFramesPerPacket(); 
    8281