diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
| commit | ebb4abf2081026c63bb5c983f76447d9d2413656 (patch) | |
| tree | f2b3ed868645fd2546173be3500f4c3e0cdf3ecc /stream | |
| parent | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (diff) | |
| parent | 20571d6f6870dab84624cc6b6fbac82cde204f16 (diff) | |
| download | mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.bz2 mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.xz | |
Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/tvi_dshow.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 438ce7288f..726f469098 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -883,7 +883,7 @@ static HRESULT load_freq_table(int nCountry, int nInputType, TRCCountryList *pCountryList; int i, index; - mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: load_freq_table called %d (%d)\n",nCountry,nInputType); + mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: load_freq_table called %d (%s)\n",nCountry,nInputType == TunerInputAntenna ? "broadcast" : "cable"); /* ASSERT(sizeof(TRCCountryList)==10); // need properly aligned structure */ if (!pplFreqTable || !pnFirst || !pnLen) @@ -926,6 +926,7 @@ static HRESULT load_freq_table(int nCountry, int nInputType, } for (i = 0; i < *pnLen; i++) { (*pplFreqTable)[i] = plFreqTable[i + 2]; + mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: load_freq_table #%d => (%ld)\n",i+*pnFirst,(*pplFreqTable)[i]); } FreeLibrary(hDLL); return S_OK; @@ -1028,7 +1029,7 @@ static HRESULT set_nearest_freq(priv_t * priv, long lFreq) TunerInputType tunerInput; long lInput; - mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: set_nearest_freq called\n"); + mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: set_nearest_freq called: %ld\n", lFreq); if(priv->freq_table_len == -1 && !priv->freq_table) { hr = OLE_CALL_ARGS(priv->pTVTuner, get_ConnectInput, &lInput); @@ -1058,11 +1059,13 @@ static HRESULT set_nearest_freq(priv_t * priv, long lFreq) nChannel = priv->first_channel + i; lFreqDiff = labs(lFreq - priv->freq_table[i]); } + mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: set_nearest_freq #%d (%ld) => %d (%ld)\n",i+priv->first_channel,priv->freq_table[i], nChannel,lFreqDiff); } if (nChannel == -1) { mp_msg(MSGT_TV,MSGL_ERR, MSGTR_TVI_DS_UnableFindNearestChannel); return E_FAIL; } + mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: set_nearest_freq #%d (%ld)\n",nChannel,priv->freq_table[nChannel - priv->first_channel]); hr = OLE_CALL_ARGS(priv->pTVTuner, put_Channel, nChannel, AMTUNER_SUBCHAN_DEFAULT, AMTUNER_SUBCHAN_DEFAULT); if (FAILED(hr)) { @@ -1087,7 +1090,7 @@ static int set_frequency(priv_t * priv, long lFreq) { HRESULT hr; - mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: set_frequency called\n"); + mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: set_frequency called: %ld\n", lFreq); if (!priv->pTVTuner) return TVI_CONTROL_FALSE; if (priv->direct_setfreq_call) { //using direct call to set frequency @@ -3478,7 +3481,7 @@ static int control(priv_t * priv, int cmd, void *arg) return TVI_CONTROL_FALSE; ret = get_frequency(priv, &lFreq); - lFreq = lFreq * 16 / 1000000; //convert from Hz to 1/16 MHz units + lFreq = lFreq / (1000000/16); //convert from Hz to 1/16 MHz units *(unsigned long *) arg = lFreq; return ret; @@ -3489,7 +3492,7 @@ static int control(priv_t * priv, int cmd, void *arg) if (!priv->pTVTuner) return TVI_CONTROL_FALSE; //convert to Hz - nFreq = 1000000 * nFreq / 16; //convert from 1/16 MHz units to Hz + nFreq = (1000000/16) * nFreq; //convert from 1/16 MHz units to Hz return set_frequency(priv, nFreq); } case TVI_CONTROL_VID_SET_HUE: |