diff options
| author | Jochen Dolze <vdr@dolze.de> | 2011-02-08 18:46:19 +0100 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2011-02-08 18:46:19 +0100 |
| commit | 44d861cb39b59700ea5b8bd79da088d0d5400a23 (patch) | |
| tree | d69bdc6f3f147480a35efffbb6a77b4cc1665448 /command/video.cpp | |
| parent | d426c3c5d7b064b1568d0f73fd930ba97e88822a (diff) | |
| download | vdr-plugin-markad-44d861cb39b59700ea5b8bd79da088d0d5400a23.tar.gz vdr-plugin-markad-44d861cb39b59700ea5b8bd79da088d0d5400a23.tar.bz2 | |
Prevent overlap detection to detect former overlaps in ad block
Diffstat (limited to 'command/video.cpp')
| -rw-r--r-- | command/video.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/command/video.cpp b/command/video.cpp index d896847..6f7081b 100644 --- a/command/video.cpp +++ b/command/video.cpp @@ -675,8 +675,12 @@ MarkAdPos *cMarkAdOverlap::Detect() if (simcnt>similarMaxCnt) { - result.FrameNumberBefore=histbuf[OV_BEFORE][tmpB].framenumber; - result.FrameNumberAfter=histbuf[OV_AFTER][tmpA].framenumber; + if ((histbuf[OV_BEFORE][tmpB].framenumber>result.FrameNumberBefore) && + (histbuf[OV_AFTER][tmpA].framenumber>result.FrameNumberAfter)) + { + result.FrameNumberBefore=histbuf[OV_BEFORE][tmpB].framenumber; + result.FrameNumberAfter=histbuf[OV_AFTER][tmpA].framenumber; + } } else { @@ -827,7 +831,7 @@ bool cMarkAdVideo::aspectratiochange(MarkAdAspectRatio &a, MarkAdAspectRatio &b, } -MarkAdPos *cMarkAdVideo::Process2ndPass(int FrameNumber, int Frames, bool BeforeAd) +MarkAdPos *cMarkAdVideo::ProcessOverlap(int FrameNumber, int Frames, bool BeforeAd) { if (!FrameNumber) return NULL; if (!overlap) overlap=new cMarkAdOverlap(macontext); |