Changeset 535

Show
Ignore:
Timestamp:
08/21/07 07:55:08 (16 years ago)
Author:
ppalmers
Message:

fix bug: returning length without setting it to a specific value sometimes prevents stream startup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/libstreaming/AmdtpStreamProcessor.cpp

    r494 r535  
    8080                  unsigned char *tag, unsigned char *sy, 
    8181                  int cycle, unsigned int dropped, unsigned int max_length) { 
    82  
     82     
    8383    struct iec61883_packet *packet = (struct iec61883_packet *) data; 
    84     if (cycle<0) return RAW1394_ISO_OK; 
    85  
    86     m_last_cycle=cycle; 
    87  
     84     
     85    if (cycle<0) { 
     86        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,%d)\n", 
     87            cycle, m_running, m_disabled, m_is_disabled); 
     88         
     89        *tag = 0; 
     90        *sy = 0; 
     91        *length=0; 
     92        return RAW1394_ISO_OK; 
     93     
     94    } 
     95     
    8896    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,%d)\n", 
    8997        cycle, m_running, m_disabled, m_is_disabled); 
     98     
     99    m_last_cycle=cycle; 
    90100 
    91101#ifdef DEBUG 

  • trunk/libffado/src/libstreaming/IsoHandler.cpp

    r445 r535  
    569569bool IsoXmitHandler::start(int cycle) 
    570570{ 
    571     debugOutput( DEBUG_LEVEL_VERBOSE, "start on cycle %d\n", cycle); 
     571    debugOutput( DEBUG_LEVEL_VERBOSE, "start on cycle %d, %d prebuffers\n",  
     572        cycle, m_prebuffers); 
    572573 
    573574    if(!(IsoHandler::start(cycle))) {