diff options
| author | Jochen Dolze <vdr@dolze.de> | 2010-11-05 22:02:29 +0100 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2010-11-05 22:02:29 +0100 |
| commit | a6fb12c83bb712faa270b3cba7ff3d2b17b0209e (patch) | |
| tree | a04e055159d456fbf2a9cd76156a19fcfe9bb7d2 | |
| parent | 3b606130ead038b4d5bc1b88bfd6e7430adacc4d (diff) | |
| download | vdr-plugin-markad-a6fb12c83bb712faa270b3cba7ff3d2b17b0209e.tar.gz vdr-plugin-markad-a6fb12c83bb712faa270b3cba7ff3d2b17b0209e.tar.bz2 | |
Small fixups, removed P1,P2 of RTL logo
| -rw-r--r-- | command/logos/RTL_Television-A16_9-P1.pgm | bin | 3017 -> 0 bytes | |||
| -rw-r--r-- | command/logos/RTL_Television-A16_9-P2.pgm | bin | 3017 -> 0 bytes | |||
| -rw-r--r-- | command/markad-standalone.cpp | 4 |
3 files changed, 3 insertions, 1 deletions
diff --git a/command/logos/RTL_Television-A16_9-P1.pgm b/command/logos/RTL_Television-A16_9-P1.pgm Binary files differdeleted file mode 100644 index 3c2122c..0000000 --- a/command/logos/RTL_Television-A16_9-P1.pgm +++ /dev/null diff --git a/command/logos/RTL_Television-A16_9-P2.pgm b/command/logos/RTL_Television-A16_9-P2.pgm Binary files differdeleted file mode 100644 index 80a3f4c..0000000 --- a/command/logos/RTL_Television-A16_9-P2.pgm +++ /dev/null diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp index a9bfdb1..b74e6e3 100644 --- a/command/markad-standalone.cpp +++ b/command/markad-standalone.cpp @@ -269,6 +269,7 @@ void cMarkAdStandalone::CheckStartStop(int frame, bool checkend) { // check if we have an MT_ASPECTCHANGE in low distance clMark *aspectmark=marks.GetPrev(newpos,MT_ASPECTSTART); + if (!aspectmark) aspectmark=marks.GetNext(newpos,MT_ASPECTSTART); if (aspectmark) { int MAXMARKDIFF=(int) (macontext.Video.Info.FramesPerSecond*20); @@ -517,6 +518,7 @@ void cMarkAdStandalone::CheckAspectRatio_and_AudioChannels() { isyslog("DolbyDigital5.1 audio detected. logo/border detection disabled"); bDecodeVideo=false; + setAudio20=false; setAudio51=true; reprocess=true; } @@ -729,7 +731,7 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark) deleteLogoBorder=true; } - if ((Mark->Type==MT_ASPECTSTART) && (Mark->Position>chkLEFT) && + if (((Mark->Type & 0xF0)==MT_ASPECTCHANGE) && (Mark->Position>chkLEFT) && (Mark->Position<chkRIGHT) && (!macontext.Video.Options.IgnoreLogoDetection)) { if (!loggedAlready) |