Mercurial > mplayer.hg
changeset 1555:076c27342828
Start/Stop state flag fixed - requires for brightness/contrast/etc stuff...
| author | arpi |
|---|---|
| date | Thu, 16 Aug 2001 15:41:03 +0000 |
| parents | db379aa38e51 |
| children | 30078d692e63 |
| files | loader/dshow/DS_VideoDec.c loader/dshow/DS_VideoDecoder.c loader/dshow/libwin32.h |
| diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/loader/dshow/DS_VideoDec.c Thu Aug 16 15:36:12 2001 +0000 +++ b/loader/dshow/DS_VideoDec.c Thu Aug 16 15:41:03 2001 +0000 @@ -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); }
--- a/loader/dshow/DS_VideoDecoder.c Thu Aug 16 15:36:12 2001 +0000 +++ b/loader/dshow/DS_VideoDecoder.c Thu Aug 16 15:41:03 2001 +0000 @@ -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,9 +550,12 @@ { 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 // contrast 74
--- a/loader/dshow/libwin32.h Thu Aug 16 15:36:12 2001 +0000 +++ b/loader/dshow/libwin32.h Thu Aug 16 15:41:03 2001 +0000 @@ -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)