Changeset 268

Show
Ignore:
Timestamp:
06/19/06 18:46:29 (16 years ago)
Author:
jwoithe
Message:

StreamProcessor::m_framecounter is now signed again, since the ability to go
negative is utilised for some devices in certain circumstances.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp

    r266 r268  
    11991199        // update the frame counter 
    12001200        incrementFrameCounter(nevents); 
    1201         if(m_framecounter>m_period) { 
     1201        if(m_framecounter>(signed int)m_period) { 
    12021202           retval=RAW1394_ISO_DEFER; 
    12031203           debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"defer!\n"); 
     
    12531253    // therefore we first check if this is ok 
    12541254     
    1255      if(m_framecounter > m_period) { 
     1255     if(m_framecounter > (signed int)m_period) { 
    12561256        // we make this signed, because this can be < 0 
    12571257        unsigned int m_last_timestamp_ticks = CYCLE_COUNTER_TO_TICKS(m_last_timestamp); 
  • branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp

    r267 r268  
    158158    // keep this at the end, because otherwise the raw1394_loop_iterate functions inner loop 
    159159    // keeps requesting packets, that are not nescessarily ready 
    160     if(m_framecounter>m_period) { 
     160    if(m_framecounter>(signed int)m_period) { 
    161161       retval=RAW1394_ISO_DEFER; 
    162162    } 
     
    176176     // this implementation just waits until there is one period of samples 
    177177     // transmitted from the buffer 
    178      return (m_framecounter > m_period);  
     178     return (m_framecounter > (signed int)m_period);  
    179179} 
    180180  
     
    743743        // keep this at the end, because otherwise the raw1394_loop_iterate functions inner loop 
    744744        // keeps requesting packets without going to the xmit handler, leading to xmit starvation 
    745         if(m_framecounter>m_period) { 
     745        if(m_framecounter>(signed int)m_period) { 
    746746                retval=RAW1394_ISO_DEFER; 
    747747        } 
     
    764764     // this implementation just waits until there is one period of samples 
    765765     // received into the buffer 
    766     if(m_framecounter > m_period) { 
     766    if(m_framecounter > (signed int)m_period) { 
    767767        return true; 
    768768    } 
  • branches/libfreebob-2.0/src/libstreaming/StreamProcessor.h

    r265 r268  
    121121 
    122122        unsigned int m_xruns; 
    123         unsigned int m_framecounter; 
     123        signed int m_framecounter; 
    124124 
    125125        unsigned int m_framerate;