Checkin noad-0.8.6

Author: madmartin

ChangeLog

@@ -1,3 +1,15 @@
+Version 0.8.6
+- fixes for ffmpeg 1.2
+
+Version 0.8.5
+- fixed a bug setting marks on non-IFrames
+- fixed a bug reusing saved logos
+- new tool checkMarks for checking that all marks are on IFrames
+- new script (checkAllMarks) for checking all records for faulty marks and re-noad them
+
+Version 0.8.4
+- fixed handling of hdtv-recordings
+
 Version 0.8.x
 - can use libmpeg2 or libavcodec(ffmpeg) for video-decoding
 - configure uses pkg-config to detect libmpeg2/libavcodec by default

Makefile.am

@@ -4,16 +4,17 @@ noinst_LIBRARIES=libnoad.a
 libnoad_a_SOURCES=tools.cpp vdr_cl.cpp svdrpc.cpp  \
 	tools.h vdr_cl.h svdrpc.h 
 
-bin_PROGRAMS=noad
+bin_PROGRAMS=noad checkMarks
 noad_SOURCES=audiotools.cpp cchecklogo.cpp ccontrol.cpp cgetlogo.cpp ctoolbox.cpp \
 		noad.cpp noaddata.cpp tnoad.cpp ffmpeg_decoder.cpp libmpeg2_decoder.cpp mpeg_decoder.cpp \
 	        main.cpp \
-	    	audiotools.h cchecklogo.h ccontrol.h cgetlogo.h ctoolbox.h \
+	    	audiotools.h cchecklogo.h ccontrol.h cgetlogo.h ctoolbox.h channels.h \
 		noad.h tnoad.h noaddata.h videodir.h \
 		ffmpeg_decoder.h libmpeg2_decoder.h mpeg2wrap_ffmpeg.h mpeg_decoder.h yuvbuf.h
 
-
+checkMarks_SOURCES=checkmarks.cpp
 noad_LDADD=libnoad.a
+checkMarks_LDADD=libnoad.a
 
 noinst_PROGRAMS=@PICSRC@ @TOOLSRC@
 EXTRA_PROGRAMS=markpics showindex
@@ -24,6 +25,6 @@ markpics_CXXFLAGS=@markpiccxxflags@
 showindex_SOURCES=showindex.cpp
 showindex_LDADD=libnoad.a
 
-bin_SCRIPTS=allnewnoad allnoad allnoadnice allnoaduncut clearlogos noadifnew stat2html statupd noadcall.sh
+bin_SCRIPTS=allnewnoad allnoad allnoadnice allnoaduncut clearlogos noadifnew stat2html statupd noadcall.sh checkAllMarks
 
 EXTRA_DIST=$(bin_SCRIPTS) README.en mystat.HTML noad_scripts.zip

Makefile.in

@@ -36,7 +36,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = noad$(EXEEXT)
+bin_PROGRAMS = noad$(EXEEXT) checkMarks$(EXEEXT)
 EXTRA_PROGRAMS = markpics$(EXEEXT) showindex$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -69,6 +69,9 @@ am_libnoad_a_OBJECTS = tools.$(OBJEXT) vdr_cl.$(OBJEXT) \
 libnoad_a_OBJECTS = $(am_libnoad_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_checkMarks_OBJECTS = checkmarks.$(OBJEXT)
+checkMarks_OBJECTS = $(am_checkMarks_OBJECTS)
+checkMarks_DEPENDENCIES = libnoad.a
 am_markpics_OBJECTS = markpics-markpics.$(OBJEXT)
 markpics_OBJECTS = $(am_markpics_OBJECTS)
 markpics_DEPENDENCIES = libnoad.a
@@ -137,10 +140,10 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libnoad_a_SOURCES) $(markpics_SOURCES) $(noad_SOURCES) \
-	$(showindex_SOURCES)
-DIST_SOURCES = $(libnoad_a_SOURCES) $(markpics_SOURCES) \
-	$(noad_SOURCES) $(showindex_SOURCES)
+SOURCES = $(libnoad_a_SOURCES) $(checkMarks_SOURCES) \
+	$(markpics_SOURCES) $(noad_SOURCES) $(showindex_SOURCES)
+DIST_SOURCES = $(libnoad_a_SOURCES) $(checkMarks_SOURCES) \
+	$(markpics_SOURCES) $(noad_SOURCES) $(showindex_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -273,18 +276,20 @@ libnoad_a_SOURCES = tools.cpp vdr_cl.cpp svdrpc.cpp  \
 noad_SOURCES = audiotools.cpp cchecklogo.cpp ccontrol.cpp cgetlogo.cpp ctoolbox.cpp \
 		noad.cpp noaddata.cpp tnoad.cpp ffmpeg_decoder.cpp libmpeg2_decoder.cpp mpeg_decoder.cpp \
 	        main.cpp \
-	    	audiotools.h cchecklogo.h ccontrol.h cgetlogo.h ctoolbox.h \
+	    	audiotools.h cchecklogo.h ccontrol.h cgetlogo.h ctoolbox.h channels.h \
 		noad.h tnoad.h noaddata.h videodir.h \
 		ffmpeg_decoder.h libmpeg2_decoder.h mpeg2wrap_ffmpeg.h mpeg_decoder.h yuvbuf.h
 
+checkMarks_SOURCES = checkmarks.cpp
 noad_LDADD = libnoad.a
+checkMarks_LDADD = libnoad.a
 noinst_PROGRAMS = @PICSRC@ @TOOLSRC@
 markpics_SOURCES = markpics.cpp
 markpics_LDADD = libnoad.a @markpics_ldadd@
 markpics_CXXFLAGS = @markpiccxxflags@
 showindex_SOURCES = showindex.cpp
 showindex_LDADD = libnoad.a
-bin_SCRIPTS = allnewnoad allnoad allnoadnice allnoaduncut clearlogos noadifnew stat2html statupd noadcall.sh
+bin_SCRIPTS = allnewnoad allnoad allnoadnice allnoaduncut clearlogos noadifnew stat2html statupd noadcall.sh checkAllMarks
 EXTRA_DIST = $(bin_SCRIPTS) README.en mystat.HTML noad_scripts.zip
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -389,6 +394,9 @@ clean-binPROGRAMS:
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+checkMarks$(EXEEXT): $(checkMarks_OBJECTS) $(checkMarks_DEPENDENCIES) 
+	@rm -f checkMarks$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(checkMarks_OBJECTS) $(checkMarks_LDADD) $(LIBS)
 markpics$(EXEEXT): $(markpics_OBJECTS) $(markpics_DEPENDENCIES) 
 	@rm -f markpics$(EXEEXT)
 	$(AM_V_CXXLD)$(markpics_LINK) $(markpics_OBJECTS) $(markpics_LDADD) $(LIBS)
@@ -443,6 +451,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cchecklogo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccontrol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgetlogo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkmarks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctoolbox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffmpeg_decoder.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2_decoder.Po@am__quote@

README

@@ -245,4 +245,13 @@ Ab Version 0.8 wurde der Video-Decoder 
 werden. Default ist, wenn m�glich, ffmpeg. Wird der libmpeg-decoder gew�hlt, so wird bei Ekennung einer HD-Aufnahme 
 automatisch zum ffmpeg-decoder gewechselt.
 
+Ab noad 0.8.5:
+Neues Tool "checkMarks" zum �berpr�fen der Marken f�r eine Aufnahme.
+Durch einen Fehler in den 0.8.x-Versionen kann es vorkommen, das Marken auf falsche Frames gesetzt werden. Um diese
+Aufnahmen zu finden gibt es jetzt ein Tool f�r die Markenpr�fung. 
+Um alle Aufnahmen mit fehlerhaften Marken zu finden 
+und die Marken neu zu setzen ist ein script (checkAllMarks) mitgeliefert. Dieses script erwartet als Parameter ein 
+Video-Aufnahmeverzeichnis. Es werden dann in diesem Aufnahmeverzeichnis alle Aufnahmen mit checkMarks �berpr�ft und 
+die Marken ggf. mit einem Aufruf der aktuellen noad-Version neu gesucht.
+
 Fehlermeldungen, Anregungen, Hinweise und auch Erfahrungsberichte an: [email protected]

README.en

@@ -215,4 +215,12 @@ decoder - choose video-decoder
 You can choose between libmpeg2 or libavcodec(ffmpeg) as video-decoder. Default is ffmpeg if possible. If you choose libmpeg2 and
 noad detects a hd-video ffmpeg will be used if possible.
 
+noad 0.8.5:
+New tool "checkMarks" for checking the marks for a recording.
+Due to an error in the 0.8.x-Versions there can be marks on non-IFrames. To identify those recordings there is now a 
+tool for checking the marks.
+To find all recordings with faulty marks there is a scrip called "checkAllMarks". This script has to be called with
+a vdr-video-directory as parameter. It searches all recordings in that dir and checks them with checkMarks.
+If necessary, recordings with faulty marks will be rescanned with the curent noad-programm.
+
 Send bug-reports and hints to: [email protected]

allnoaduncut

@@ -14,5 +14,5 @@ then
 fi
 vdir=${1}
 shift
-find $vdir -follow -type d -name '*.rec' ! -path '*/%*' -exec ./noad $* - '{}' ';'
+find $vdir -follow -type d -name '*.rec' ! -path '*/%*' -exec noad $* - '{}' ';'
 

audiotools.cpp

@@ -3,13 +3,16 @@
 bool havesilence = false;
 #ifdef HAVE_LIBAVCODEC
 
-#include "mpeg2wrap.h"
 #include "mpeg2wrap_ffmpeg.h"
 extern "C"
 {
    #include "libavcodec/avcodec.h"
 }
 
+#if LIBAVCODEC_VERSION_MAJOR > 54
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio 
+#endif
+
 // from libavutil/intreadwrite.h:
 #define AV_RB32(x)  ((((const uint8_t*)(x))[0] << 24) | \
                      (((const uint8_t*)(x))[1] << 16) | \
@@ -47,6 +50,9 @@ int pr = 1;
 uint8_t *outbuf=NULL;
 AVCodec *codec=NULL;
 AVCodecContext *codecContext= NULL;
+#if LIBAVCODEC_VERSION_MAJOR > 54
+AVDictionary *avDictionary = NULL;                // "create" an empty dictionary
+#endif
 int64_t basepts=0;
 int64_t audiobasepts=0;
 //int64_t audiopts=0;
@@ -102,8 +108,13 @@ void initAVCodec()
   codecContext = avcodec_alloc_context3(codec);
 #endif
 
+#if LIBAVCODEC_VERSION_MAJOR > 54
+   /* open it */
+   if (avcodec_open2(codecContext, codec, &avDictionary) < 0)
+#else
   /* open it */
   if (avcodec_open(codecContext, codec) < 0)
+#endif
   {
     fprintf(stderr, "could not open codec\n");
   }
@@ -118,6 +129,9 @@ void exitAVCodec()
 {
   free(outbuf);
   avcodec_close(codecContext);
+#if LIBAVCODEC_VERSION_MAJOR > 54
+  av_dict_free(&avDictionary);
+#endif
   av_free(codecContext);
   av_codec_initialised = false;
 }
@@ -179,7 +193,7 @@ int scan_audio_stream_0(unsigned char *mbuf, int count)
     if (len < 0)
     {
       //fprintf(stderr, "Error while decoding audio\n\n");
-		esyslog("Error while decoding audio (ignored)");
+      // esyslog("Error while decoding audio (ignored)");
       resetAudioBuffer();
       size=0;
       break;