diff options
| author | Jochen Dolze <vdr@dolze.de> | 2011-02-05 10:21:08 +0100 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2011-02-05 10:21:08 +0100 |
| commit | 0cdd5f421a5d7ad511473bf5d97a5e8c1c2c9c04 (patch) | |
| tree | ce99f433f3898d4eafc5bbc3923c00ccf130566d /command/video.cpp | |
| parent | db484337eb3fac1b6a66eaa71d38b6206b6d97da (diff) | |
| download | vdr-plugin-markad-0cdd5f421a5d7ad511473bf5d97a5e8c1c2c9c04.tar.gz vdr-plugin-markad-0cdd5f421a5d7ad511473bf5d97a5e8c1c2c9c04.tar.bz2 | |
Changed overlap detection
Diffstat (limited to 'command/video.cpp')
| -rw-r--r-- | command/video.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/command/video.cpp b/command/video.cpp index 0f34617..d896847 100644 --- a/command/video.cpp +++ b/command/video.cpp @@ -590,8 +590,6 @@ cMarkAdOverlap::cMarkAdOverlap(MarkAdContext *maContext) histbuf[OV_BEFORE]=NULL; histbuf[OV_AFTER]=NULL; - result.CommentBefore=NULL; - result.CommentAfter=NULL; Clear(); } @@ -616,8 +614,6 @@ void cMarkAdOverlap::Clear() delete[] histbuf[OV_AFTER]; histbuf[OV_AFTER]=NULL; } - if (result.CommentBefore) free(result.CommentBefore); - if (result.CommentAfter) free(result.CommentAfter); memset(&result,0,sizeof(result)); similarCutOff=0; similarMaxCnt=0; @@ -660,19 +656,22 @@ MarkAdPos *cMarkAdOverlap::Detect() { for (int A=start; A<histcnt[OV_AFTER]; A++) { - //printf("%6i %6i ",histbuf[BEFORE][B].framenumber,histbuf[AFTER][A].framenumber); + //printf("%6i %6i ",histbuf[OV_BEFORE][B].framenumber,histbuf[OV_AFTER][A].framenumber); bool simil=areSimilar(histbuf[OV_BEFORE][B].histogram,histbuf[OV_AFTER][A].histogram); if (simil) { 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 { - //if (simcnt) printf("%i %i %i\n",simcnt,histbuf[BEFORE][B].framenumber,histbuf[AFTER][A].framenumber); + //if (simcnt) printf("simcnt=%i\n",simcnt); if (simcnt>similarMaxCnt) { @@ -699,15 +698,6 @@ MarkAdPos *cMarkAdOverlap::Detect() return NULL; } } - - if (asprintf(&result.CommentBefore,"detected overlap before (%i)",result.FrameNumberBefore)==-1) - { - result.CommentBefore=NULL; - } - if (asprintf(&result.CommentAfter,"detected overlap after (%i)",result.FrameNumberAfter)==-1) - { - result.CommentAfter=NULL; - } return &result; } @@ -716,7 +706,7 @@ MarkAdPos *cMarkAdOverlap::Process(int FrameNumber, int Frames, bool BeforeAd) if ((lastframenumber>0) && (!similarMaxCnt)) { similarCutOff=50000; // lower is harder! - similarMaxCnt=6; + similarMaxCnt=4; } if (BeforeAd) |