Changeset 4747

Show
Ignore:
Timestamp:
03/30/10 12:04:17 (4 years ago)
Author:
douglask
Message:

Fixed pixel format conversion for DV and fallback RGB24

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/mpeg4/video/grabber-win32DS.cpp

    r4744 r4747  
    752752     else if (have_YUY2_) 
    753753       packedYUYV422_to_planarYUYV420((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    754      else if (have_UYVY_ || have_HDYC_) 
     754     else if (have_UYVY_ || have_HDYC_ || have_DVSD_) 
    755755       packedUYVY422_to_planarYUYV420((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    756      else if (have_RGB24_) 
     756     else // if (have_RGB24_) 
    757757       converter_->convert((u_int8_t*)last_frame_, width_, height_, frame_, outw_, outh_, TRUE); 
    758          else 
    759        packedUYVY422_to_planarYUYV420((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    760758     break; 
    761759 
     
    763761     if (have_YUY2_) 
    764762       packedYUYV422_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    765      else if (have_UYVY_ || have_HDYC_) 
     763     else if (have_UYVY_ || have_HDYC_ || have_DVSD_) 
    766764       packedUYVY422_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    767765     else if (have_I420_) 
    768766       planarYUYV420_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    769      else if (have_RGB24_) 
     767     else // if (have_RGB24_) 
    770768       converter_->convert((u_int8_t*)last_frame_, width_, height_, frame_, outw_, outh_, TRUE); 
    771          else 
    772        packedUYVY422_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_); 
    773769     break; 
    774770   }