Update of /cvsroot/mplayer/main/loader/DirectShow In directory mplayer:/var/tmp.root/cvs-serv21348 Modified Files: DS_VideoDec.cpp DS_VideoDecoder.cpp libwin32.h Log Message: Start/Stop state flag fixed - requires for brightness/contrast/etc stuff... Index: DS_VideoDec.cpp =================================================================== RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDec.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DS_VideoDec.cpp 16 Aug 2001 00:50:02 -0000 1.10 +++ DS_VideoDec.cpp 16 Aug 2001 15:41:03 -0000 1.11 @@ -44,12 +44,12 @@ extern "C" void DS_VideoDecoder_Start(){ DS_VideoDecoder* dec=(DS_VideoDecoder*) _handle; - dec->StartInternal(); + dec->Start(); } extern "C" void DS_VideoDecoder_Stop(){ DS_VideoDecoder* dec=(DS_VideoDecoder*) _handle; - dec->StopInternal(); + dec->Stop(); } extern "C" void DS_VideoDecoder_Restart(){ @@ -72,6 +72,7 @@ extern "C" int DS_SetValue_DivX(char* name, int value){ DS_VideoDecoder* dec=(DS_VideoDecoder*) _handle; + printf("DS_SetValue_DivX(%s),%d)\n",name,value); return (int) dec->SetValue(name,value); } Index: DS_VideoDecoder.cpp =================================================================== RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDecoder.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DS_VideoDecoder.cpp 16 Aug 2001 00:50:02 -0000 1.1 +++ DS_VideoDecoder.cpp 16 Aug 2001 15:41:03 -0000 1.2 @@ -155,6 +155,8 @@ || (info.dll == string("divx_c32.ax")) || (info.dll == string("wmvds32.ax")) || (info.dll == string("wmv8ds32.ax"))); + + printf("m_bIsDivX=%d\n",m_bIsDivX); } catch (FatalError& error) { @@ -548,8 +550,11 @@ { if (m_bIsDivX) { + if (m_State != START) return VFW_E_NOT_RUNNING; + + printf("DS_VideoDecoder::SetValue(%s,%d)\n",name,value); //cout << "set value " << name << " " << value << endl; // brightness 87 Index: libwin32.h =================================================================== RCS file: /cvsroot/mplayer/main/loader/DirectShow/libwin32.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libwin32.h 16 Aug 2001 00:50:02 -0000 1.1 +++ libwin32.h 16 Aug 2001 15:41:03 -0000 1.2 @@ -279,8 +279,8 @@ virtual ~IVideoDecoder(){}; virtual void StartInternal()=0; virtual void StopInternal()=0; - void Stop(){ StopInternal();} - void Start(){StartInternal();} + void Stop(){ StopInternal(); m_State = STOP;} + void Start(){StartInternal(); m_State = START;} const CodecInfo& record; DecodingMode m_Mode; // should we do precaching (or even change Quality on the fly)