diff options
| author | Jochen Dolze <vdr@dolze.de> | 2011-02-13 12:32:22 +0100 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2011-02-13 12:36:22 +0100 |
| commit | d98d610825cf9e3d283428e6c1791f7a0f03f649 (patch) | |
| tree | 428b21a3adb2e332381cbb4b1c3cfcbb080a2b12 /command/video.cpp | |
| parent | 9e964370ba635f57df44a96506fc4bf633004a86 (diff) | |
| download | vdr-plugin-markad-d98d610825cf9e3d283428e6c1791f7a0f03f649.tar.gz vdr-plugin-markad-d98d610825cf9e3d283428e6c1791f7a0f03f649.tar.bz2 | |
removed "scan AC3 always" option, added "correct info file"v0.0.9
new default options: repair index=off, correct info file=off
markad now relies on the F framerate parameter (no internal correction)
improved overlap handling
added some logos
added spanisch translations (thanks to jbjbjb)
Diffstat (limited to 'command/video.cpp')
| -rw-r--r-- | command/video.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/command/video.cpp b/command/video.cpp index 77b77fa..cf5f649 100644 --- a/command/video.cpp +++ b/command/video.cpp @@ -45,14 +45,15 @@ cMarkAdLogo::cMarkAdLogo(MarkAdContext *maContext) GY[2][1] = -2; GY[2][2] = -1; - LOGOHEIGHT=LOGO_DEFHEIGHT; if (maContext->Info.VPid.Type==MARKAD_PIDTYPE_VIDEO_H264) { LOGOWIDTH=LOGO_DEFHDWIDTH; + LOGOHEIGHT=LOGO_DEFHDHEIGHT; } else { LOGOWIDTH=LOGO_DEFWIDTH; + LOGOHEIGHT=LOGO_DEFHEIGHT; } pixfmt_info=false; @@ -666,7 +667,10 @@ MarkAdPos *cMarkAdOverlap::Detect() tmpA=A; tmpB=B; start=A+1; - simcnt++; + if (simil<(similarCutOff/2)) simcnt+=2; + else if (simil<(similarCutOff/4)) simcnt+=4; + else if (simil<(similarCutOff/6)) simcnt+=6; + else simcnt++; break; } else @@ -675,8 +679,12 @@ MarkAdPos *cMarkAdOverlap::Detect() if (simcnt>similarMaxCnt) { - result.FrameNumberBefore=histbuf[BEFORE][tmpB].framenumber; - result.FrameNumberAfter=histbuf[AFTER][tmpA].framenumber; + if ((histbuf[BEFORE][tmpB].framenumber>result.FrameNumberBefore) && + (histbuf[AFTER][tmpA].framenumber>result.FrameNumberAfter)) + { + result.FrameNumberBefore=histbuf[BEFORE][tmpB].framenumber; + result.FrameNumberAfter=histbuf[AFTER][tmpA].framenumber; + } } else { |