From a9829b55f99465d6194de0e8e8fb648d24d79317 Mon Sep 17 00:00:00 2001 From: Jochen Dolze Date: Wed, 9 Mar 2011 20:32:52 +0100 Subject: Decreased cutval in logo detection Added italian translation from Diego Pierotto Added slovak translation from Milan Hrala Added logos from Dominic Evans Added logo from Copperhead --- command/logos/DMAX-A16_9-P0.pgm | Bin 0 -> 10728 bytes command/logos/E4+1-A16_9-P0.pgm | Bin 0 -> 19219 bytes command/logos/E4+1-A4_3-P0.pgm | Bin 14020 -> 19219 bytes command/logos/E4-A16_9-P0.pgm | Bin 0 -> 10019 bytes command/logos/E4-A4_3-P0.pgm | Bin 0 -> 19219 bytes command/logos/E4_A16_9-P0.pgm | Bin 9919 -> 0 bytes command/logos/ITV3-A16_9-P0.pgm | Bin 0 -> 19219 bytes command/markad-standalone.cpp | 7 +++---- command/po/it_IT.po | 26 ++++++++++++++++++++++++++ command/po/sk_SK.po | 23 +++++++++++++++++++++++ command/video.cpp | 8 ++++---- 11 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 command/logos/DMAX-A16_9-P0.pgm create mode 100644 command/logos/E4+1-A16_9-P0.pgm create mode 100644 command/logos/E4-A16_9-P0.pgm create mode 100644 command/logos/E4-A4_3-P0.pgm delete mode 100644 command/logos/E4_A16_9-P0.pgm create mode 100644 command/logos/ITV3-A16_9-P0.pgm create mode 100644 command/po/it_IT.po create mode 100644 command/po/sk_SK.po (limited to 'command') diff --git a/command/logos/DMAX-A16_9-P0.pgm b/command/logos/DMAX-A16_9-P0.pgm new file mode 100644 index 0000000..c79317f Binary files /dev/null and b/command/logos/DMAX-A16_9-P0.pgm differ diff --git a/command/logos/E4+1-A16_9-P0.pgm b/command/logos/E4+1-A16_9-P0.pgm new file mode 100644 index 0000000..16d0853 Binary files /dev/null and b/command/logos/E4+1-A16_9-P0.pgm differ diff --git a/command/logos/E4+1-A4_3-P0.pgm b/command/logos/E4+1-A4_3-P0.pgm index b29c2e0..3ba41b2 100644 Binary files a/command/logos/E4+1-A4_3-P0.pgm and b/command/logos/E4+1-A4_3-P0.pgm differ diff --git a/command/logos/E4-A16_9-P0.pgm b/command/logos/E4-A16_9-P0.pgm new file mode 100644 index 0000000..bf61f0f Binary files /dev/null and b/command/logos/E4-A16_9-P0.pgm differ diff --git a/command/logos/E4-A4_3-P0.pgm b/command/logos/E4-A4_3-P0.pgm new file mode 100644 index 0000000..3bc0b9c Binary files /dev/null and b/command/logos/E4-A4_3-P0.pgm differ diff --git a/command/logos/E4_A16_9-P0.pgm b/command/logos/E4_A16_9-P0.pgm deleted file mode 100644 index acefd71..0000000 Binary files a/command/logos/E4_A16_9-P0.pgm and /dev/null differ diff --git a/command/logos/ITV3-A16_9-P0.pgm b/command/logos/ITV3-A16_9-P0.pgm new file mode 100644 index 0000000..3e9b461 Binary files /dev/null and b/command/logos/ITV3-A16_9-P0.pgm differ diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp index 33fb53b..3f38cf4 100644 --- a/command/markad-standalone.cpp +++ b/command/markad-standalone.cpp @@ -221,7 +221,7 @@ void cMarkAdStandalone::CheckStop() } else { - isyslog("removing marks from position %i",iStop); + isyslog("removing marks from position %i, if any",iStop); } marks.DelTill(iStop,false); } @@ -469,7 +469,7 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark) clMark *prev=marks.GetLast(); if (prev) { - if ((Mark->Type==MT_LOGOSTART) && (!iStart)) + if ((Mark->Type==MT_LOGOSTART) && (!iStart) && (Mark->Positiontype==MT_LOGOSTOP) { @@ -2014,7 +2014,6 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig * { isyslog("timer info usage disabled by user"); } - if (config->logoExtraction!=-1) { // just to be sure extraction works @@ -2073,7 +2072,7 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig * } else { - if (!CheckLogo()) + if (!CheckLogo() && (config->logoExtraction==-1)) { isyslog("no logo found, logo detection disabled"); macontext.Video.Options.IgnoreLogoDetection=true; diff --git a/command/po/it_IT.po b/command/po/it_IT.po new file mode 100644 index 0000000..4c0e06d --- /dev/null +++ b/command/po/it_IT.po @@ -0,0 +1,26 @@ +# This file is distributed under the same license as the markad package. +# +msgid "" +msgstr "" +"Project-Id-Version: markad\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-27 15:32+0200\n" +"PO-Revision-Date: 2011-03-05 15:55+0100\n" +"Last-Translator: Diego Pierotto \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Italian\n" +"X-Poedit-Country: ITALY\n" +"X-Poedit-SourceCharset: utf-8\n" + +msgid "starting markad for" +msgstr "avvio markad per" + +msgid "markad aborted for" +msgstr "markad annullato per" + +msgid "markad finished for" +msgstr "markad completato per" + diff --git a/command/po/sk_SK.po b/command/po/sk_SK.po new file mode 100644 index 0000000..41f782b --- /dev/null +++ b/command/po/sk_SK.po @@ -0,0 +1,23 @@ +# This file is distributed under the same license as the markad package. +# +msgid "" +msgstr "" +"Project-Id-Version: markad\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-27 15:32+0200\n" +"PO-Revision-Date: 2011-03-01 20:30+0100\n" +"Last-Translator: milan hrala \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "starting markad for" +msgstr "Spúšťa sa vyhladávanie reklamy v" + +msgid "markad aborted for" +msgstr "Vyhladávanie reklamy zrušené v" + +msgid "markad finished for" +msgstr "Vyhladávanie reklamy skončilo v" + diff --git a/command/video.cpp b/command/video.cpp index ffb24cf..31d0bdc 100644 --- a/command/video.cpp +++ b/command/video.cpp @@ -223,8 +223,8 @@ int cMarkAdLogo::SobelPlane(int plane) } int boundary=6; - int cutval=127; - //int cutval=60; + //int cutval=127; + int cutval=32; int width=LOGOWIDTH; if (plane>0) @@ -335,13 +335,13 @@ int cMarkAdLogo::Detect(int framenumber, int *logoframenumber) } if (extract) return LOGO_NOCHANGE; if (!processed) return LOGO_ERROR; - +#if 0 if (processed==1) { if ((area.intensity>100) || (area.status!=LOGO_VISIBLE) && (area.intensity>180)) return LOGO_NOCHANGE; } - +#endif int ret=LOGO_NOCHANGE; if (area.status==LOGO_UNINITIALIZED) { -- cgit v1.2.3