Packman Build Service PMBS

avidemux3.changes Changed

avidemux3.spec Changed

@@ -27,7 +27,7 @@
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.11
+Version:        2.6.12
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
@@ -48,9 +48,8 @@
 Patch4:         avidemux-package_version.patch
 Patch5:         avidemux-bootStrap.patch
 Patch6:         avidemux-cpu_armel.patch
-Patch7:         avidemux-ADM_VERSION.patch
-Patch8:         avidemux-cmake-permissions.patch
-Patch9:         avidemux-find-lrelease-qt5.patch
+Patch7:         avidemux-cmake-permissions.patch
+Patch8:         avidemux-find-lrelease-qt5.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -258,8 +257,8 @@
 find ./ -name '*.sql' -exec dos2unix -q {} \;
 find ./ -name '*.txt' -exec dos2unix -q {} \;
 find . -type f -exec sed -i -e 's|intfloat_readwrite.h|intfloat.h|g' {} \;
-sed -i -e 's|set(FFMPEG_VERSION "2.7.2")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
-rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.2.tar.bz2
+sed -i -e 's|set(FFMPEG_VERSION "2.7.6")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
+rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.6.tar.bz2
 cp %{S:2} avidemux_core/ffmpeg_package/
 pushd avidemux_core/ffmpeg_package/patches
 rm -f config.mak.diff
@@ -288,10 +287,9 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
-%patch7 -p0
-%patch8 -p1
+%patch7 -p1
 %if %{with build_qt5}
-%patch9 -p0
+%patch8 -p0
 %endif
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
@@ -452,6 +450,7 @@
 %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4.so
 %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4v2.so
 %{_libdir}/ADM_plugins6/muxers/libADM_mx_raw.so
+%{_libdir}/ADM_plugins6/muxers/libADM_mx_Webm.so
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/ultraFast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/PSP.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json

avidemux-ADM_VERSION.patch Deleted

avidemux_2.6.11.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-2.7.2.tar.bz2 Deleted

avidemux_2.6.11.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

avidemux_2.6.11.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

@@ -20,6 +20,9 @@
 #include "fourcc.h"
 #include "ADM_edit.hxx"
 #include "ADM_vidMisc.h"
+
+#define pivotPrintf(...) {}
+
 /**
     \fn getNKFramePTS
 */
@@ -216,6 +219,59 @@
     }
     return false;
 }
+/** 
+ * \fn getFrameNumberBeforePts
+ * \brief Search the framenumber that has a valid PTS = what's given or  before
+ *         it can be equal to refTime
+ * @param v
+ * @param refTime
+ * @param frameNumber
+ * @return 
+ */
+bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber)
+{
+    uint32_t nbFrame = v->_nb_video_frames;
+    uint64_t pts, dts;
+    uint32_t curFrame=nbFrame >> 1;
+    uint32_t splitMoval = curFrame >> 1;
+    pivotPrintf("Looking for frame with a pts   %s\n",ADM_us2plain(refTime));
+    // Try to find the frame that as the timestamp close enough to refTime, while being smaller
+    do 
+    {
+        // seems like the pts determination, not always works -> retry if necessary
+        bool worked;
+        do {
+                pts=ADM_NO_PTS;
+                worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);
+                if (worked && pts != ADM_NO_PTS) 
+                    break; // found                
+                curFrame--;
+                if (!curFrame)
+                {
+                        ADM_warning("The whole segment is corrupted. Abort the search");
+                        return false;
+                }
+        } while(true);
+        pivotPrintf("SplitMoval=%d\n",splitMoval);
+        if(pts==refTime)
+            break;
+        if (!splitMoval) 
+            break;        
+        pivotPrintf("Pivot time is %d, %s\n",curFrame,ADM_us2plain(pts));
+        if (pts >= refTime)
+                curFrame -= splitMoval;
+        else
+                curFrame += splitMoval;
+        splitMoval >>= 1;
+        pivotPrintf("Split=%d\n",splitMoval);        
+    } while(refTime != pts);
+
+    pivotPrintf("-Matching frame is %d, time is  %s\n",curFrame,ADM_us2plain(pts));
+    if (pts > refTime && curFrame)
+            curFrame--;
+    frameNumber=curFrame;
+    return true;
+}
 /**
     \fn searchPreviousKeyFrameInRef
     \brief Search next key frame in ref video ref
@@ -224,57 +280,49 @@
     @param nkTime : Time of the ref video
 
 */
+
 bool ADM_Composer::searchPreviousKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nkTime)
 {
     // Search for the current frame with quick search
     _VIDEOS *v = _segments.getRefVideo(ref);
     uint32_t nbFrame = v->_nb_video_frames;
     uint64_t pts, dts;
-	uint32_t curFrame=nbFrame >> 1;
-	uint32_t splitMoval = curFrame >> 1;
-	do {
-		// seems like the pts determination, not always works -> retry if necessary
-		bool worked;
-		do {
-			worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);
-			if (!worked || pts == ADM_NO_PTS) {
-				curFrame++;
-				if (curFrame == nbFrame) {
-					ADM_warning("The whole segment is corrupted. Abort the search");
-					return false;
-				}
-			} else
-				break;
-		} while(true);
-
-		if (splitMoval != 0) {
-			if (pts >= refTime)
-				curFrame -= splitMoval;
-			else
-				curFrame += splitMoval;
-			splitMoval >>= 1;
-		} else
-			break;
-	} while(refTime != pts);
+    int curFrame;
 
-	if (pts < refTime)
-		curFrame++;
-	for (int i=curFrame; i>=0; i--) 
-        {
-        uint64_t p;
-        uint32_t flags;
-                v->_aviheader->getFlags(i,&flags);
-                if(!(flags & AVI_KEY_FRAME)) continue;
-		if(!v->_aviheader->getPtsDts(i,&pts,&dts) || pts == ADM_NO_PTS)
-                {
-			ADM_warning("The keyframe with PTS less than %"PRIu32"ms is corrupted\n",refTime/1000);
-                        continue;
-                }
-                if(pts>=refTime) continue;
-		*nkTime = pts;
-		return true;
-	}
-    ADM_warning("Cannot find keyframe with PTS less than %"PRIu32"ms\n",refTime/1000);
+    // look up the frame we are starting from...
+    if(!getFrameNumFromPtsOrBefore(v,refTime,curFrame))
+    {
+        ADM_warning("Cannot locate the frame we are talking about at PTS=%s\n",ADM_us2plain(refTime));
+        return false;
+    }
+    // rewind until we find a keyframe
+    for (int i=curFrame; i>=0; i--) 
+    {
+    uint64_t p;
+    uint32_t flags;
+            v->_aviheader->getFlags(i,&flags);
+            if(!(flags & AVI_KEY_FRAME)) 
+                continue;
+            if(!v->_aviheader->getPtsDts(i,&pts,&dts))
+                continue;
+            if(pts == ADM_NO_PTS)
+                continue;
+            pivotPrintf("-- Previous Kf ! This one is %s\n",ADM_us2plain(pts));
+            pivotPrintf("-- Ref is %s\n",ADM_us2plain(refTime));
+            pivotPrintf("-- DTS %s\n",ADM_us2plain(dts));
+            if(pts>=refTime) 
+                continue;
+            *nkTime = pts; // ok found it
+#if 0            
+            for(int j=0;j<5;j++)
+            {
+                 if(!v->_aviheader->getPtsDts(i+j,&pts,&dts)) continue ;
+                 printf("Neighbor [%d] = %s\n",j,ADM_us2plain(pts));
+            }
+#endif            
+            return true;
+    }
+    ADM_warning("Cannot find keyframe with PTS less than %s\n",ADM_us2plain(refTime));
     return false;
 }

avidemux_2.6.11.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp -> avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp -> avidemux_2.6.12.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.6.12.tar.gz/avidemux/common/gui_savenew.cpp Changed

@@ -250,24 +250,27 @@
         uint32_t extraLen;
         video_body->getExtraHeaderData(&extraLen,&extra);
 //#warning do something better
-        ADM_videoStreamCopy *copy=NULL;
+        ADM_videoStreamCopy *copy=NULL;        
         if(isH264Compatible(info.fcc))
         {
+            bool isAnnexB=!extraLen; // this is not very good
             if(muxer->preferH264AnnexB())
             {
-                ADM_info("The video stream is H264\n");
+                ADM_info("The video stream is a flavor of H264\n");
                 ADM_info("The muxer prefers AnnexB H264 bitstream\n");
-                if(extraLen)
+                if(!isAnnexB)
                 {
                     // Need to do mp4 to annexB    
-                    ADM_info("Probably AnnexB bitstream\n");
+                    ADM_info("Input is probably MP4 bitstream\n");
                     copy=new ADM_videoStreamCopyToAnnexB(markerA,markerB);
                 }
             }else
             {
-                if(!extraLen)
+                ADM_info("The video stream is a flavor of H264\n");
+                ADM_info("The muxer prefers MP4 style H264 bitstream\n");
+                if(isAnnexB)
                 {
-                    ADM_info("Probably AnnexB bitstream\n");
+                    ADM_info("Input is probably AnnexB bitstream\n");
                     copy=new ADM_videoStreamCopyFromAnnexB(markerA,markerB);
                 }
             }
@@ -275,6 +278,7 @@
         
         if(!copy)
         {
+            ADM_info("Simple copy mode engaged\n");
             copy=new ADM_videoStreamCopy(markerA,markerB);
         }
         video=copy;

avidemux_2.6.11.tar.gz/avidemux/common/main.cpp -> avidemux_2.6.12.tar.gz/avidemux/common/main.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp -> avidemux_2.6.12.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_gtkRender.cpp -> avidemux_2.6.12.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_gtkRender.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/gtk/CMakeLists.txt -> avidemux_2.6.12.tar.gz/avidemux/gtk/CMakeLists.txt Changed

avidemux_2.6.11.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -> avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp Changed

@@ -153,10 +153,10 @@
    ui.tableWidget->addAction(runNow);
    ui.tableWidget->addAction(setOk);
    ui.tableWidget->addAction(setReady);
-   connect(del,SIGNAL(activated()),this,    SLOT(del()));
-   connect(runNow,SIGNAL(activated()),this, SLOT(runNow()));
-   connect(setOk,SIGNAL(activated()),this,  SLOT(setOk()));
-   connect(setReady,SIGNAL(activated()),this,SLOT(setReady()));
+   connect(del,SIGNAL(triggered()),this,    SLOT(del()));
+   connect(runNow,SIGNAL(triggered()),this, SLOT(runNow()));
+   connect(setOk,SIGNAL(triggered()),this,  SLOT(setOk()));
+   connect(setReady,SIGNAL(triggered()),this,SLOT(setReady()));
 
    connect(ui.pushButtonQuit,SIGNAL(pressed()),this,SLOT(quit()));
    connect(ui.pushButtonRunAll,SIGNAL(pressed()),this,SLOT(runAllJob()));
@@ -263,18 +263,22 @@
 
 void jobWindow::del(void)
 {
+    ADM_info("Del\n");
     runAction(JobAction_delete);
 }
 void jobWindow::setOk(void)
 {
+    ADM_info("Ok\n");
     runAction(JobAction_setOk);
 }
 void jobWindow::setReady(void)
 {
+    ADM_info("setReady\n");
     runAction(JobAction_setReady);
 }
 void jobWindow::runNow(void)
 {
+    ADM_info("runNow\n");
     runAction(JobAction_runNow);
 }

avidemux_2.6.11.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

avidemux_2.6.11.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -13,12 +13,11 @@
     </message>
     <message>
         <source>MPEG-2 requant</source>
-        <translation type="obsolete">Cuantizador MPEG</translation>
+        <translation type="obsolete">recuantizar MPEG-2</translation>
     </message>
     <message>
         <source>dummy</source>
-        <translation type="obsolete">
-            </translation>
+        <translation type="obsolete">vacio</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -30,8 +29,7 @@
     </message>
     <message>
         <source>Dummy</source>
-        <translation type="obsolete">
-            </translation>
+        <translation type="obsolete">Vacio</translation>
     </message>
     <message>
         <source>None</source>
@@ -56,16 +54,16 @@
     <message>
         <source>The beginning frame is not a key frame.
 Please move the A marker.</source>
-        <translation type="obsolete">La imagen inicial no es un Imagen-Clave
+        <translation type="obsolete">La imagen inicial no es una Imagen-Clave
 Desplace el marcador A.</translation>
     </message>
     <message>
         <source>_Use systray while encoding</source>
-        <translation type="obsolete">Minimizar en el tray al codificar</translation>
+        <translation type="obsolete">_Minimizar al codificar</translation>
     </message>
     <message>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation type="obsolete">Permitir frecuencia de sonido no estándar para DVD</translation>
+        <translation type="obsolete">_Permitir frecuencia de sonido no estándar para DVD</translation>
     </message>
     <message>
         <source>Create _OpenDML files</source>
@@ -73,27 +71,27 @@
     </message>
     <message>
         <source>Automatically _index MPEG files</source>
-        <translation type="obsolete">Indexar automáticamente archivos MPEG</translation>
+        <translation type="obsolete">_Indexar automáticamente archivos MPEG</translation>
     </message>
     <message>
         <source>Automatically _swap A and B if A&gt;B</source>
-        <translation type="obsolete">Indexar automáticamente archivos MPEG</translation>
+        <translation type="obsolete">Intercambiar _automaticamente A y B si A&gt;B</translation>
     </message>
     <message>
         <source>_Disable NUV audio sync</source>
-        <translation type="obsolete">Desactivar sincronización de audio NUV</translation>
+        <translation type="obsolete">_Desactivar sincronización de audio NUV</translation>
     </message>
     <message>
         <source>Automatically _build VBR map</source>
-        <translation type="obsolete">Construir automáticamente mapa VBR</translation>
+        <translation type="obsolete">_Construir automáticamente mapa VBR</translation>
     </message>
     <message>
         <source>Automatically _rebuild index</source>
-        <translation type="obsolete">Reconstruir automáticamente el índice</translation>
+        <translation type="obsolete">_Reconstruir automáticamente el índice</translation>
     </message>
     <message>
         <source>Automatically remove _packed bitstream</source>
-        <translation type="obsolete">Eliminar automáticamente el empaquetado bitstream</translation>
+        <translation type="obsolete">Eliminar automáticamente el em_paquetado bitstream</translation>
     </message>
     <message>
         <source>SIMD</source>
@@ -137,11 +135,11 @@
     </message>
     <message>
         <source>_lavc threads:</source>
-        <translation type="obsolete">Procesos Xvid:</translation>
+        <translation type="obsolete">Hilos _lavc:</translation>
     </message>
     <message>
         <source>Multi-threading</source>
-        <translation type="obsolete">Multi-tarea</translation>
+        <translation type="obsolete">Multi-hilo</translation>
     </message>
     <message>
         <source>Above normal</source>
@@ -157,15 +155,15 @@
     </message>
     <message>
         <source>_Encoding priority:</source>
-        <translation type="obsolete">Prioridad de codificación:</translation>
+        <translation type="obsolete">_Prioridad de codificación:</translation>
     </message>
     <message>
         <source>_Indexing/unpacking priority:</source>
-        <translation type="obsolete">Prioridad de Indexado/descompresión:</translation>
+        <translation type="obsolete">Prioridad de _Indexado/descompresión:</translation>
     </message>
     <message>
         <source>_Playback priority:</source>
-        <translation type="obsolete">Prioridad de reproducción:</translation>
+        <translation type="obsolete">Prioridad de _reproducción:</translation>
     </message>
     <message>
         <source>Prioritisation</source>
@@ -173,7 +171,7 @@
     </message>
     <message>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="obsolete">Usar un tag alternativo para MP3 en .mp4</translation>
+        <translation type="obsolete">_Usar tag alternativo para MP3 en .mp4</translation>
     </message>
     <message>
         <source>XVideo (best)</source>
@@ -185,7 +183,7 @@
     </message>
     <message>
         <source>Video _display:</source>
-        <translation type="obsolete">Bitrate vídeo:</translation>
+        <translation type="obsolete">Mostrar _Video:</translation>
     </message>
     <message>
         <source>No alerts</source>
@@ -201,7 +199,7 @@
     </message>
     <message>
         <source>_Message level:</source>
-        <translation type="obsolete">Nivel de mensaje:</translation>
+        <translation type="obsolete">Nivel de _mensaje:</translation>
     </message>
     <message>
         <source>Master</source>
@@ -209,11 +207,11 @@
     </message>
     <message>
         <source>_Volume control:</source>
-        <translation type="obsolete">Control de volumen:</translation>
+        <translation type="obsolete">Control de _Volumen:</translation>
     </message>
     <message>
         <source>No downmixing</source>
-        <translation type="obsolete">Sin downmixing (multicanal)</translation>
+        <translation type="obsolete">Sin downmixing</translation>
     </message>
     <message>
         <source>Pro Logic</source>
@@ -225,7 +223,7 @@
     </message>
     <message>
         <source>_Local playback downmixing:</source>
-        <translation type="obsolete">Downmixing de reproducción Local:</translation>
+        <translation type="obsolete">Downmixing de reproducción _Local:</translation>
     </message>
     <message>
         <source>De_ringing</source>
@@ -304,7 +302,7 @@
     </message>
     <message>
         <source>Timecode:</source>
-        <translation type="obsolete">Marca de tiempo:</translation>
+        <translation type="obsolete">Marcador de tiempo:</translation>
     </message>
     <message>
         <source>_Dynamic range compression</source>
@@ -901,7 +899,7 @@
     </message>
     <message>
         <source>Marker A &gt; B</source>
-        <translation type="obsolete">Marcador A &gt; B</translation>
+        <translation type="obsolete">Marcadordor A &gt; B</translation>
     </message>
     <message>
         <source>Cannot copy.</source>
@@ -2140,8 +2138,7 @@
     </message>
     <message>
         <source>Smart Copy</source>
-        <translation type="obsolete">
-            </translation>
+        <translation type="obsolete">Copia Inteligente</translation>
     </message>
     <message>
         <source>Trouble initializing audio device</source>
@@ -4262,7 +4259,7 @@
     </message>
     <message>
         <source>Timecode:</source>
-        <translation type="unfinished">Marca de tiempo:</translation>
+        <translation type="unfinished">Marcador de tiempo:</translation>
     </message>
     <message>
         <source>0/0</source>
@@ -5640,35 +5637,35 @@

avidemux_2.6.11.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi -> avidemux_2.6.12.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi Changed

avidemux_2.6.11.tar.gz/avidemux_core/ADM_core/include/ADM_crashdump_mingw.h -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_crashdump_mingw.h Changed

avidemux_2.6.11.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp Changed

@@ -13,6 +13,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <windows.h>
+#include <excpt.h>
 
 #include "ADM_crashdump.h"
 #include <stdio.h>
@@ -20,8 +22,30 @@
 #include <imagehlp.h>
 #include <cxxabi.h>
 
+
+static LONG WINAPI ExceptionFilter(struct _EXCEPTION_POINTERS *exceptionInfo);
 static ADM_saveFunction *mysaveFunction = NULL;
 static ADM_fatalFunction *myFatalFunction = NULL;
+
+
+/**
+ * \fn installSigHandler
+ * \brief add hook to catch exception (null pointers etc...)
+ */
+void installSigHandler(void)
+{    
+    SetUnhandledExceptionFilter(ExceptionFilter);
+}
+/**
+ * \fn uninstallSigHandler
+ * \brief
+ */
+void uninstallSigHandler(void)
+{
+    
+}
+
+
 /**
  * 
  * @param save
@@ -225,7 +249,7 @@
 	RtlCaptureContext_* contextFunc = (RtlCaptureContext_*)GetProcAddress(hinstLib, "RtlCaptureContext");
 	STACKFRAME frame;
 	CONTEXT context;
-	int limit = 50;
+	int limit = 70;
 	DWORD machineType;
 
 	memset(&frame, 0, sizeof(STACKFRAME));
@@ -267,7 +291,7 @@
  * @param exceptionRecord
  * @param contextRecord
  */
-void HandleException(struct _EXCEPTION_RECORD *exceptionRecord, struct _CONTEXT *contextRecord)
+void HandleException(const char *message,struct _EXCEPTION_RECORD *exceptionRecord, struct _CONTEXT *contextRecord)
 {
     std::string s;
 	fflush(stderr);
@@ -293,12 +317,21 @@
 	{
 		s+=DumpExceptionInfo(process, exceptionRecord, contextRecord);
 	}
+        fflush(stderr);
+	fflush(stdout);	
 
 	s+=DumpBackTrace(process);
+        fflush(stderr);
+	fflush(stdout);	
+        
+        const char *title;
+        if(!message) title="Crash";
+            else     title=message;
         if (myFatalFunction)
-		myFatalFunction("Crash", s.c_str());
+		myFatalFunction(title, s.c_str());
 	SymCleanup(process);
-
+        fflush(stderr);
+	fflush(stdout);	
 	exit(1);
 }
 /**
@@ -311,7 +344,7 @@
  */
 EXCEPTION_DISPOSITION ExceptionHandler(struct _EXCEPTION_RECORD *exceptionRecord, void *establisherFrame, struct _CONTEXT *contextRecord, void *dispatcherContext)
 {
-	HandleException(exceptionRecord, contextRecord);
+	HandleException("ExceptionHandler",exceptionRecord, contextRecord);
 }
 /**
  * 
@@ -320,8 +353,20 @@
  */
 LONG WINAPI ExceptionFilter(struct _EXCEPTION_POINTERS *exceptionInfo)
 {
-	HandleException(exceptionInfo->ExceptionRecord, exceptionInfo->ContextRecord);
+	HandleException("ExceptionFilter",exceptionInfo->ExceptionRecord, exceptionInfo->ContextRecord);
+        return EXCEPTION_CONTINUE_SEARCH;
+}
+/**
+ * 
+ * @param pExceptionInfo
+ * @return 
+ */
+LONG WINAPI TopLevelExceptionHandler(struct _EXCEPTION_POINTERS *exceptionInfo)
+{
+    HandleException("TopLevelExceptionHandler",exceptionInfo->ExceptionRecord, exceptionInfo->ContextRecord);
+    return EXCEPTION_CONTINUE_SEARCH;
 }
+
 /**
  * 
  * @param info
@@ -330,5 +375,7 @@
  */
 void ADM_backTrack(const char *info, int lineno, const char *file)
 {	
-	HandleException(NULL, NULL);
+    char title[2048]={0};
+        snprintf(title,2000,"%s at line %d, file %s",info,lineno,file);
+	HandleException(title,NULL, NULL);
 }

avidemux_2.6.11.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp Changed

@@ -164,49 +164,42 @@
 {
 	if(mysaveFunction)
 		mysaveFunction();
-
-#if !defined(__HAIKU__)
-	char wholeStuff[2048];
-#if !defined(__sun__)
+#define MAX_BACKTRACK 30
+#if !defined(__HAIKU__) && !defined(__sun__)
+    char wholeStuff[2048];
     char buffer[4096];
     char in[2048];
-	void *stack[20];
+	void *stack[MAX_BACKTRACK+1];
 	char **functions;
 	int count, i;
-#endif
 	wholeStuff[0]=0;
 
 	printf("\n*********** BACKTRACK **************\n");
 
-#if !defined(__sun__)
-	count = backtrace(stack, 20);
+	count = backtrace(stack, MAX_BACKTRACK);
 	functions = backtrace_symbols(stack, count);
-#endif
 	sprintf(wholeStuff,"%s\n at line %d, file %s",info,lineno,file);
-#if !defined(__sun__)
-    int status;
-    size_t size=2047;
+        int status;
+        size_t size=2047;
     // it looks like that xxxx (functionName+0x***) XXXX
 	for (i=0; i < count; i++)
 	{
-        char *s=strstr(functions[i],"(");
-        buffer[0]=0;
-        if(s && strstr(s+1,"+"))
-        {
-            strcpy(in,s+1);
-            char *e=strstr(in,"+");
-            *e=0;
-            __cxxabiv1::__cxa_demangle(in,buffer,&size,&status);
-            if(status) strcpy(buffer,in);
-        }else
-            strcpy(buffer,functions[i]);
-        printf("%s:%d:<%s>:%d\n",functions[i],i,buffer,status);
-		strcat(wholeStuff,buffer);
-		strcat(wholeStuff,"\n");
-	}
-#else
-	backtrace(fileno(stdout));
-#endif
+            char *s=strstr(functions[i],"(");
+            buffer[0]=0;
+            if(s && strstr(s+1,"+"))
+            {
+                strcpy(in,s+1);
+                char *e=strstr(in,"+");
+                *e=0;
+                __cxxabiv1::__cxa_demangle(in,buffer,&size,&status);
+                if(status) 
+                    strcpy(buffer,in);
+            }else
+                strcpy(buffer,functions[i]);
+            printf("%s:%d:<%s>:%d\n",functions[i],i,buffer,status);
+            strcat(wholeStuff,buffer);
+            strcat(wholeStuff,"\n");
+        }
 	printf("*********** BACKTRACK **************\n");
 
 	if(myFatalFunction)

avidemux_2.6.11.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt Changed

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h Changed

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h Changed

@@ -86,10 +86,11 @@
     static VdpStatus mixerCreate(uint32_t width,uint32_t height, VdpVideoMixer *mixer,bool deinterlace=false);
     static VdpStatus mixerDestroy(VdpVideoMixer mixer);
     static VdpStatus mixerRender(VdpVideoMixer mixer,VdpVideoSurface sourceSurface,VdpOutputSurface targetOutputSurface, uint32_t targetWidth, uint32_t targetHeight );
+    static VdpStatus mixerRenderWithCropping(VdpVideoMixer mixer,VdpVideoSurface sourceSurface,VdpOutputSurface targetOutputSurface, uint32_t targetWidth, uint32_t targetHeight ,
+                                            uint32_t sourceWidth, uint32_t sourceHeight);
     static VdpStatus mixerRenderWithPastAndFuture(bool topField,VdpVideoMixer mixer,
                                 VdpVideoSurface sourceSurface[3], // Past present future
-                                VdpOutputSurface targetOutputSurface,
-                                uint32_t targetWidth, uint32_t targetHeight );
+                                VdpOutputSurface targetOutputSurface, uint32_t targetWidth,     uint32_t targetHeight,uint32_t sourceWidth,     uint32_t sourceHeight );
     static VdpStatus mixerGetAttributesValue(VdpVideoMixer mixer,
                                 uint32_t attrCount,
                                 const  VdpVideoMixerAttribute *xkeys,
@@ -102,6 +103,9 @@
     {
                 return (x+15) & ~15;
     }
+    static VdpStatus outputSurfaceGetParameters(  VdpOutputSurface surface,    VdpRGBAFormat *  rgba_format,
+                            uint32_t *       width,    uint32_t *       height);
+    static VdpStatus surfaceGetParameters(VdpVideoSurface surface,VdpChromaType *chomra,uint32_t *w,uint32_t *h);
 
 #endif
 };

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h Changed

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp Changed

@@ -102,6 +102,8 @@
     GetMe(putBitsYV12OutputSurface,VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_Y_CB_CR);
     GetMe(putBitsCapsOutputSurface,VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_PUT_BITS_Y_CB_CR_CAPABILITIES);
     GetMe(getBitsNativeOutputSurface,VDP_FUNC_ID_OUTPUT_SURFACE_GET_BITS_NATIVE);
+    
+    
 
     GetMe(presentationQueueDestroy,VDP_FUNC_ID_PRESENTATION_QUEUE_DESTROY);
     GetMe(presentationQueueCreate,VDP_FUNC_ID_PRESENTATION_QUEUE_CREATE);
@@ -119,7 +121,8 @@
 
     GetMe(mixerGetAttributesValue,VDP_FUNC_ID_VIDEO_MIXER_GET_ATTRIBUTE_VALUES);
     GetMe(mixerSetAttributesValue,VDP_FUNC_ID_VIDEO_MIXER_SET_ATTRIBUTE_VALUES);
-
+    GetMe(mixerGetOutputSurfaceParameters,VDP_FUNC_ID_OUTPUT_SURFACE_GET_PARAMETERS); ///
+    GetMe(mixerGetSurfaceParameters,VDP_FUNC_ID_VIDEO_SURFACE_GET_PARAMETERS); ///
     if(VDP_STATUS_OK!=ADM_coreVdpau::funcs.presentationQueueDisplayX11Create(ADM_coreVdpau::vdpDevice,x->systemWindowId,&queueX11))
     {
         ADM_warning("Cannot create X11 Presentation Queue\n");
@@ -335,6 +338,24 @@
      ( void * const *)ptr,
     pitches));
 }
+
+
+/**
+    \fn
+    \brief
+*/
+VdpStatus admVdpau::outputSurfaceGetParameters(  VdpOutputSurface surface,    VdpRGBAFormat *  rgba_format,
+                            uint32_t *       width,    uint32_t *       height)
+{
+    CHECK(ADM_coreVdpau::funcs.mixerGetOutputSurfaceParameters(surface,rgba_format,width,height));
+}
+/**
+ */
+VdpStatus admVdpau::surfaceGetParameters(VdpVideoSurface surface,VdpChromaType *chroma,uint32_t *w,uint32_t *h)
+{
+    CHECK(ADM_coreVdpau::funcs.mixerGetSurfaceParameters(surface,chroma,w,h));
+}
+
 /**
     \fn
     \brief

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp Changed

@@ -15,11 +15,11 @@
 #include "ADM_default.h"
 #include "../include/ADM_coreVdpau.h"
 
-#ifdef USE_VDPAU
+#if defined(USE_VDPAU) 
 #include "../include/ADM_coreVdpauInternal.h"
 #include "ADM_dynamicLoading.h"
 
-#if 1
+#if 0
     #define aprintf ADM_info
 #else
     #define aprintf(...) {}
@@ -77,6 +77,7 @@
 uint32_t color=VDP_CHROMA_TYPE_420;
 void    *values[MIXER_NB_PARAM]={&width,&height,&color};
     int nbFeature=0;
+    ADM_info("Creating vdpauMixer with width=%d, height=%d color=%d\n",width,height,color);
     //features[nbFeature++]=VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L5;
     if(deinterlace)
     {
@@ -131,6 +132,79 @@
                 NULL,                               // dest video Rec
                 0,NULL);                            // Layers
                 
+#if 0      
+  ADM_info("Target width=%d height=%d\n", targetWidth,targetHeight);
+  VdpRGBAFormat fmt;
+  VdpChromaType chroma;
+  uint32_t tw,th;
+  
+  if(VDP_STATUS_OK!=ADM_coreVdpau::funcs.mixerGetOutputSurfaceParameters(targetOutputSurface,&fmt,&tw,&th))
+  {
+      ADM_warning("VdpOutputSurfaceGetParameters failed\n");
+  }
+  ADM_info("output surface width=%d height=%d fmt=%d\n", tw,th,fmt);
+  if(VDP_STATUS_OK!=ADM_coreVdpau::funcs.mixerGetSurfaceParameters(sourceSurface,&chroma,&tw,&th))
+  {
+        ADM_warning("mixerGetSurfaceParameters failed\n");
+  }
+  ADM_info("input surface width=%d height=%d fmt=%d\n", tw,th,chroma);
+#endif
+  if(VDP_STATUS_OK!=e)
+    {
+        
+        ADM_warning("MixerRender  failed :%s\n",getErrorString(e));
+        
+    }
+    return e;
+}
+/**
+ * \fn mixerRenderWithCropping
+ * \brief Same as above but allow to take only top/left of the input image
+ * @param mixer
+ * @param sourceSurface
+ * @param targetOutputSurface
+ * @param targetWidth
+ * @param targetHeight
+ * @param sourceWidth
+ * @param sourceHeight
+ * @return 
+ */
+VdpStatus admVdpau::mixerRenderWithCropping(VdpVideoMixer mixer,
+                                VdpVideoSurface sourceSurface,
+                                VdpOutputSurface targetOutputSurface, 
+                                uint32_t targetWidth, 
+                                uint32_t targetHeight,uint32_t sourceWidth, uint32_t sourceHeight )
+{
+const VdpVideoSurface listOfInvalidSurface[1]={VDP_INVALID_HANDLE};
+
+    VdpRect rect;
+    rect.x0=rect.y0=0;
+    rect.x1=sourceWidth;
+    rect.y1=sourceHeight;
+#if 0
+    VdpChromaType sourceChroma;
+    uint32_t sourceW,sourceH;
+    ADM_coreVdpau::funcs.mixerGetSurfaceParameters(sourceSurface,&sourceChroma,&sourceW,&sourceH);
+    ADM_info("Source is %d %d x %d\n",sourceChroma,sourceW,sourceH);
+    VdpRGBAFormat rgb;
+    ADM_coreVdpau::funcs.mixerGetOutputSurfaceParameters(targetOutputSurface,&rgb,&sourceW,&sourceH);
+    ADM_info("Target is %d %d x %d\n",rgb,sourceW,sourceH);
+    ADM_info("Cropped to %d x %d ==> %d x %d\n",sourceWidth,sourceHeight,targetWidth,targetHeight);
+    ADM_info("Rect %d %d %d %d\n",rect.x0,rect.y0,rect.x1,rect.y1);
+#endif    
+      VdpStatus e=ADM_coreVdpau::funcs.mixerRender(mixer,
+                VDP_INVALID_HANDLE,NULL,    // Background
+                VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME,
+                
+                0,            listOfInvalidSurface, // Past...
+                sourceSurface,                      // current
+                0,            listOfInvalidSurface, // Future
+                &rect,                               // source RECT
+                targetOutputSurface,
+                NULL,                               // dest Rec
+                NULL,                               // dest video Rec
+                0,NULL);                            // Layers
+                
             
   if(VDP_STATUS_OK!=e)
     {
@@ -140,6 +214,7 @@
     }
     return e;
 }
+
 /**
     \fn mixerGetAttributesValue
 */
@@ -187,7 +262,9 @@
                                 VdpVideoSurface sourceSurface[3], // Past present future
                                 VdpOutputSurface targetOutputSurface, 
                                 uint32_t targetWidth, 
-                                uint32_t targetHeight )
+                                uint32_t targetHeight,
+                                uint32_t sourceWidth, 
+                                uint32_t sourceHeight        )
 {
     int nbPrev=2,nbNext=2;
     VdpVideoMixerPictureStructure fieldType=VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD;
@@ -198,6 +275,11 @@
     VdpVideoSurface future[2]={VDP_INVALID_HANDLE,VDP_INVALID_HANDLE};
     VdpVideoSurface present;
 
+    VdpRect rect;
+    rect.x0=rect.y0=0;
+    rect.x1=sourceWidth;
+    rect.y1=sourceHeight;
+    
     present=sourceSurface[1];
     int index=0;
     if(!topField) index=1;
@@ -224,7 +306,7 @@
                 nbPrev,       past, // Past...
                               present, // current
                 nbNext,       future, // Future
-                NULL,                               // source RECT
+                &rect,                               // source RECT
                 targetOutputSurface,
                 NULL,                               // dest Rec
                 NULL,                               // dest video Rec

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

avidemux_2.6.11.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-2.7.6.tar.bz2 Added

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_avassert_h.patch Added

@@ -0,0 +1,22 @@
+--- libavutil/avassert.h.old	2016-01-31 00:43:51.000000000 +0100
++++ libavutil/avassert.h	2016-02-16 21:21:02.768117422 +0100
+@@ -30,14 +30,17 @@
+ #include <stdlib.h>
+ #include "avutil.h"
+ #include "log.h"
++extern void av_fatalHandler(const char *why,const char *file, int lineno);
++typedef void (AV_FATAL_HANDLER)(const char *why,int lineno, const char *file);
++
++extern void av_setFatalHandler(AV_FATAL_HANDLER *func);
+ 
+ /**
+  * assert() equivalent, that is always enabled.
+  */
+ #define av_assert0(cond) do {                                           \
+     if (!(cond)) {                                                      \
+-        av_log(NULL, AV_LOG_PANIC, "Assertion %s failed at %s:%d\n",    \
+-               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
++        av_fatalHandler( AV_STRINGIFY(cond),__FILE__,__LINE__);         \
+         abort();                                                        \
+     }                                                                   \
+ } while (0)

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch Added

@@ -0,0 +1,41 @@
+--- libavutil/log.c.old	2016-01-31 00:43:51.000000000 +0100
++++ libavutil/log.c	2016-02-16 21:24:19.943656163 +0100
+@@ -39,6 +39,7 @@
+ #include "common.h"
+ #include "internal.h"
+ #include "log.h"
++#include "avassert.h" // MEANX
+ 
+ #if HAVE_PTHREADS
+ #include <pthread.h>
+@@ -121,7 +122,7 @@
+ 
+ #endif
+ static int use_color = -1;
+-
++static AV_FATAL_HANDLER *fatalHandler=NULL; // MEANX
+ static void check_color_terminal(void)
+ {
+ #if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE
+@@ -430,7 +431,21 @@
+     missing_feature_sample(0, avc, msg, argument_list);
+     va_end(argument_list);
+ }
++// MEANX
+ 
++void av_fatalHandler(const char *why,const char *filez, int lineno)
++{
++char *cleartext[2048];
++        if(!fatalHandler)
++                printf("[CRASH] %s, file %s, lineno=%d\n",cleartext,filez,lineno);
++        else
++                (fatalHandler)(cleartext,lineno,filez);
++}
++void av_setFatalHandler(AV_FATAL_HANDLER *func)
++{
++        fatalHandler=func;
++}
++//
+ #ifdef TEST
+ // LCOV_EXCL_START
+ #include <string.h>

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_opus/ADM_opus.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_opus/ADM_opus.cpp Changed

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h Changed

@@ -39,11 +39,12 @@
              uint32_t readu32(void);  
              int32_t  reads32(void);
         /***********************************/
-        virtual     uint8_t  readBin(uint8_t *whereto,uint32_t len)=0;
-        virtual     uint8_t  skip(uint32_t nbBytes)=0;
+        virtual     bool     readBin(uint8_t *whereto,uint32_t len)=0;
+        virtual     bool     skip(uint32_t nbBytes)=0;
         virtual     uint64_t tell(void)=0;
 };
-
+/**
+ */
 class ADM_ebml_file : public ADM_ebml
 {
   protected:
@@ -52,21 +53,21 @@
                 uint64_t  _size;
                 uint32_t  _close;
   public: 
-                            ADM_ebml_file();
-                            ADM_ebml_file(ADM_ebml_file *father,uint64_t size);
-                            ~ADM_ebml_file();
-                    uint8_t open(const char *fn);
+                              ADM_ebml_file();
+                              ADM_ebml_file(ADM_ebml_file *father,uint64_t size);
+                              ~ADM_ebml_file();
+                    bool      open(const char *fn);
        
-        virtual     uint8_t   readBin(uint8_t *whereto,uint32_t len);
-        virtual     uint8_t   skip(uint32_t nbBytes);
+        virtual     bool      readBin(uint8_t *whereto,uint32_t len);
+        virtual     bool      skip(uint32_t nbBytes);
                     uint64_t  tell(void);
-                    uint8_t   seek(uint64_t pos);
-                    uint8_t   finished(void);
+                    bool      seek(uint64_t pos);
+                    bool      finished(void);
                     uint64_t  getFileSize(void) {return _size;};
-                    uint8_t   find(ADM_MKV_SEARCHTYPE search,
-                                        MKV_ELEM_ID  prim,MKV_ELEM_ID second,uint64_t *len,uint32_t rewind=1);
-                    uint8_t   simplefind(MKV_ELEM_ID  prim,uint64_t *len,uint32_t rewind=1);
-                    uint64_t remaining(void);
+                    bool      find(ADM_MKV_SEARCHTYPE search,
+                                        MKV_ELEM_ID  prim,MKV_ELEM_ID second,uint64_t *len,bool rewind=1);
+                    bool      simplefind(MKV_ELEM_ID  prim,uint64_t *len,bool rewind=true);
+                    uint64_t  remaining(void);
 };
 
 void bigHexPrint(uint64_t v);

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -63,14 +63,23 @@
             _timeBase=timeBase/1000; // We work in us
         }
   }
-  /* Now find tracks */
-  if(!ebml.find(ADM_MKV_SECONDARY,MKV_SEGMENT,MKV_TRACKS,&alen))
+  /* --*/
+  if(!ebml.simplefind(MKV_SEGMENT,&len,true))
   {
-     printf("[MKV] Cannot find tracks\n");
-    return 0;
+      printf("[MKV] Cannot find Segment\n");      
+      return false;
+  }
+  _segmentPosition=ebml.tell();
+  printf("[MKV] found Segment at 0x%llx\n",(uint64_t)_segmentPosition);
+   /* Now find tracks */
+  if(ebml.find(ADM_MKV_SECONDARY,MKV_SEGMENT,MKV_SEEK_HEAD,&alen))
+  {
+       ADM_ebml_file seekHead( &ebml,alen);
+       readSeekHead(&seekHead);       
   }
+  /* Now find tracks */
   /* And analyze them */
-  if(!analyzeTracks(&ebml,alen))
+  if(!analyzeTracks(&ebml))
   {
       printf("[MKV] incorrect tracks\n");
   }
@@ -80,13 +89,13 @@
     printf("[MKV] No video\n");
     return 0;
   }
+  readCue(&ebml);
   printf("[MKV] Indexing clusters\n");
   if(!indexClusters(&ebml))
   {
     printf("[MKV] Cluster indexing failed\n");
     return 0;
-  }
-  readCue(&ebml);
+  }  
   printf("[MKV]Found %u clusters\n",_clusters.size());
   printf("[MKV] Indexing video\n");
     if(!videoIndexer(&ebml))
@@ -343,18 +352,62 @@
  return 1;
 
 }
+
+/**
+ * \fn goBeforeAtomAtPosition
+ * \brief check and position the read at the payload for atom searchedId, return payloadSize in outputLen
+ */
+bool mkvHeader::goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen, MKV_ELEM_ID searchedId,const char *txt)
+{
+    uint64_t id,len;
+    ADM_MKV_TYPE type;
+    const char *ss;
+
+    if(!position)
+    {
+        ADM_warning("No offset available for %s\n",txt);
+        return false;
+    }
+    parser->seek(position);
+    if(!parser->readElemId(&id,&len))
+    {
+        ADM_warning("No element  available for %s\n",txt);
+        return false;
+    }
+    if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
+    {
+      printf("[MKV/SeekHead] Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+      return false;
+    }
+    if(id!=searchedId)
+    {
+        printf("Found %s instead of %s, ignored \n",ss,txt);
+        return false;
+    }    
+    outputLen=len;
+    return true;
+}
+
 /**
     \fn analyzeTracks
     \brief Read Tracks Info.
 */
-uint8_t mkvHeader::analyzeTracks(void *head,uint32_t headlen)
+bool mkvHeader::analyzeTracks(ADM_ebml_file *parser)
 {
-  uint64_t id,len;
-  ADM_MKV_TYPE type;
+  uint64_t len;
+  uint64_t id;
   const char *ss;
- ADM_ebml_file father( (ADM_ebml_file *)head,headlen);
- while(!father.finished())
- {
+  ADM_MKV_TYPE type;
+  
+  if(!goBeforeAtomAtPosition(parser, _trackPosition,len, MKV_TRACKS,"MKV_TRACKS"))
+  {
+      ADM_warning("Cannot go to the TRACKS atom\n");
+      return false;
+  }
+  
+    ADM_ebml_file father( parser,len);
+    while(!father.finished())
+    {
       father.readElemId(&id,&len);
       if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
       {
@@ -370,7 +423,7 @@
         continue;
       }
       if(!analyzeOneTrack(&father,len)) return 0;
- }
+    }
  return 1;
 }
 
@@ -543,6 +596,9 @@
   _audioStreams=NULL;
   
   readBuffer=NULL;
+  _cuePosition=0;
+  _segmentPosition=0;
+  _trackPosition=0;
 }
 /**
     \fn ~mkvHeader
@@ -765,8 +821,76 @@
     return true;
 
 }
-
-
+/**
+ * \fn readSeekHead
+ * \bried used to locate the interesting parts of the file
+ */
+bool    mkvHeader::readSeekHead(ADM_ebml_file *body)
+{
+    uint64_t vlen,len;
+    ADM_info("Parsing SeekHead\n");
+    while(!body->finished())
+    {
+        if(!body->simplefind(MKV_SEEK,&vlen,false))
+             break;         
+        ADM_ebml_file item(body,vlen);              
+        uint64_t id;
+        ADM_MKV_TYPE type;
+        const char *ss;
+
+        item.readElemId(&id,&len);
+        if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
+        {
+          printf("[MKV/SeekHead] Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+          return false;
+        }
+        if(id!=MKV_ID)
+        {
+          printf("Found %s in CUES, ignored \n",ss);
+          item.skip(len);
+          return false;
+        }
+        // read id
+        uint64_t t=item.readEBMCode_Full();
+        if(!ADM_searchMkvTag( (MKV_ELEM_ID)t,&ss,&type))
+        {
+          printf("[MKV/SeekHead] Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+          return false;
+        }
+        ADM_info("Found entry for %s\n",ss);
+        item.readElemId(&id,&len);
+        if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
+        {
+          printf("[MKV/SeekHead] Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+          return false;
+        }
+        if(id!=MKV_SEEK_POSITION)
+        {
+          printf("Found %s in CUES, ignored \n",ss);
+          item.skip(len);
+          return false;
+        }
+        uint64_t position=item.readUnsignedInt(len);
+        switch(t)
+        {
+            case MKV_CUES:
+                    _cuePosition=position+_segmentPosition;
+                    ADM_info("   at position  0x%llx\n",_cuePosition);
+                    break;
+            case MKV_TRACKS:
+                    _trackPosition=position+_segmentPosition;;
+                    ADM_info("   at position at 0x%llx\n",_trackPosition);
+            case MKV_INFO:
+            default:

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h Changed

@@ -157,13 +157,18 @@
     uint32_t                _nbAudioTrack;
     uint32_t                _currentAudioTrack;
     uint32_t                _reordered;
+    //
+    uint64_t                _segmentPosition;
+    uint64_t                _cuePosition;
+    uint64_t                _trackPosition;
 
     uint8_t                 checkHeader(void *head,uint32_t headlen);
-    uint8_t                 analyzeTracks(void *head,uint32_t headlen);
+    bool                    analyzeTracks(ADM_ebml_file *parser);
     uint8_t                 analyzeOneTrack(void *head,uint32_t headlen);
     uint8_t                 walk(void *seed);
     uint64_t                walkAndFind(void *seed,MKV_ELEM_ID searched);
     int                     searchTrackFromTid(uint32_t tid);
+    bool                    readSeekHead(ADM_ebml_file *body);
     //
     uint8_t                 reformatVorbisHeader(mkvTrak *trk);
     // Indexers
@@ -171,7 +176,7 @@
     uint8_t                 addIndexEntry(uint32_t track,ADM_ebml_file *parser,uint64_t where, uint32_t size,uint32_t flags,
                                             uint32_t timecodeMS);
     uint8_t                 videoIndexer(ADM_ebml_file *parser);
-    uint8_t                 readCue(ADM_ebml_file *parser);
+    bool                    readCue(ADM_ebml_file *parser);
     uint8_t                 indexClusters(ADM_ebml_file *parser);
     uint8_t                 indexBlock(ADM_ebml_file *parser,uint32_t count,uint32_t timecodeMS);
 
@@ -182,6 +187,8 @@
     bool                    ComputeDeltaAndCheckBFrames(uint32_t *minDeltaX, uint32_t *maxDeltaX, bool *bFramePresent);
     bool                    updateFlagsWithCue(void); // in case we can trust it, update KEY_FRAME_FLAGS
     bool                    dumpVideoIndex(int maxIndex);
+    bool                    goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen, 
+                                                MKV_ELEM_ID searchedId,const char *txt);
   public:

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

@@ -178,6 +178,16 @@
         }
         return -1;
 }
+
+static bool canRederiveFrameType(uint32_t fcc)
+{
+    if(isMpeg4Compatible(fcc)) return true;
+    if(isH264Compatible(fcc)) return true;
+    if(isMpeg12Compatible(fcc)) return true;
+    return false;
+    
+}
+
 /**
     \fn addVideoEntry
     \brief add an entry to the video index
@@ -211,7 +221,7 @@
   // For the 2 most common cases : mp4 & h264.
   // Hackish, we already read the 3 bytes header
   // But they are already taken into account in the size part 
-  if(!track) // Track 0 is video
+  if(!track && canRederiveFrameType(_videostream.fccHandler)) // Track 0 is video
   {
     if( isMpeg4Compatible(_videostream.fccHandler))
     {
@@ -322,93 +332,98 @@
   \brief Update index with cue content
 
 */
-uint8_t                 mkvHeader::readCue(ADM_ebml_file *parser)
+bool     mkvHeader::readCue(ADM_ebml_file *parser)
 {
-  uint64_t fileSize,len,bsize;
-  uint64_t alen,vlen;
+  uint64_t len,vlen;
   uint64_t id;
   ADM_MKV_TYPE type;
   const char *ss;
   uint64_t time;
-  uint64_t segmentPos;
+  
+  
 
-   parser->seek(0);
+  if(!goBeforeAtomAtPosition(parser, _cuePosition,vlen, MKV_CUES,"MKV_CUES"))
+  {
+      ADM_warning("Cannot go to the CUES atom\n");
+      return false;
+  }
 
-   if(!parser->simplefind(MKV_SEGMENT,&vlen,1))
-   {
-     printf("[MKV] Cannot find CLUSTER atom\n");
-     return 0;
-   }
-   ADM_ebml_file segment(parser,vlen);
-   segmentPos=segment.tell();
+    ADM_ebml_file cues(parser,vlen);
+    while(!cues.finished())
+    {
+           cues.readElemId(&id,&len);
+           if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
+           {
+             printf("[MKV] Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+             cues.skip(len);
+             continue;
+           }
+           if(id!=MKV_CUE_POINT)
+           {
+             printf("Found %s in CUES, ignored \n",ss);
+             cues.skip(len);
+             continue;
+           }
+           ADM_ebml_file cue(&cues,len);
+           // Cue TIME normally
+            cue.readElemId(&id,&len);
+            if(id!=MKV_CUE_TIME)
+            {
+               ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+               printf("Found %s(0x%"PRIx64"), expected CUE_TIME  (0x%x)\n", ss,id,MKV_CUE_TIME);
+               cue.skip(cue.remaining());
+               continue;
+            }
+            time=cue.readUnsignedInt(len);
 
-   while(segment.simplefind(MKV_CUES,&alen,0))
-  {
-   ADM_ebml_file cues(&segment,alen);
-   while(!cues.finished())
-   {
-      cues.readElemId(&id,&len);
-      if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
-      {
-        printf("[MKV] Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
-        cues.skip(len);
-        continue;
-      }
-      if(id!=MKV_CUE_POINT)
-      {
-        printf("Found %s in CUES, ignored \n",ss);
-        cues.skip(len);
-        continue;
-      }
-      ADM_ebml_file cue(&cues,len);
-      // Cue TIME normally
-       cue.readElemId(&id,&len);
-       if(id!=MKV_CUE_TIME)
-       {
-          ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-          printf("Found %s(0x%"PRIx64"), expected CUE_TIME  (0x%x)\n", ss,id,MKV_CUE_TIME);
-          cue.skip(cue.remaining());
-          continue;
-       }
-       time=cue.readUnsignedInt(len);
 
+            cue.readElemId(&id,&len);
+            if(id!=MKV_CUE_TRACK_POSITION)
+            {
+               ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+               printf("Found %s (0x%"PRIx64"), expected MKV_CUE_TRACK_POSITION (0x%x)\n", ss,id,MKV_CUE_TRACK_POSITION);
+               cue.skip(cues.remaining());
+               continue;
+            }
+            ADM_ebml_file trackPos(&cue,len);
+            uint64_t tid=0;
+            uint64_t cluster_position=0;
+            uint64_t cue_position=0;
+            while(!trackPos.finished())
+            {
+              trackPos.readElemId(&id,&len);
+              switch(id)
+              {
+                case MKV_CUE_TRACK: tid=trackPos.readUnsignedInt(len);break;
+                case MKV_CUE_CLUSTER_POSITION: cluster_position=trackPos.readUnsignedInt(len);break;
+                case MKV_CUE_RELATIVE_POSITION: cue_position=trackPos.readUnsignedInt(len);break;
+                default:
+                      ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
+                      printf("[MKV] in cluster position found tag %s (0x%"PRIx64")\n",ss,id);
+                      trackPos.skip(len);
+                      continue;
+              }
+            }
+            aprintf("Track %"PRIx64" segmentPos=%"PRIx64" Cluster Position 0x%"PRIx64" Cue position 0x%"PRIx64" Absolute=%"PRIx64" time %"PRIu64"\n",
+                  tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);  
 
-       cue.readElemId(&id,&len);
-       if(id!=MKV_CUE_TRACK_POSITION)
-       {
-          ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-          printf("Found %s (0x%"PRIx64"), expected MKV_CUE_TRACK_POSITION (0x%x)\n", ss,id,MKV_CUE_TRACK_POSITION);
-          cue.skip(cues.remaining());
-          continue;
-       }
-       ADM_ebml_file trackPos(&cue,len);
-       uint64_t tid=0;
-       uint64_t cluster_position=0;
-       uint64_t cue_position=0;
-       while(!trackPos.finished())
-       {
-         trackPos.readElemId(&id,&len);
-         switch(id)
-         {
-           case MKV_CUE_TRACK: tid=trackPos.readUnsignedInt(len);break;
-           case MKV_CUE_CLUSTER_POSITION: cluster_position=trackPos.readUnsignedInt(len);break;
-           case MKV_CUE_RELATIVE_POSITION: cue_position=trackPos.readUnsignedInt(len);break;
-           default:
-                 ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-                 printf("[MKV] in cluster position found tag %s (0x%"PRIx64")\n",ss,id);
-                 trackPos.skip(len);
-                 continue;
-         }
-       }
-       aprintf("Track %"PRIx64" segmentPos=%"PRIx64" Cluster Position 0x%"PRIx64" Cue position 0x%"PRIx64" Absolute=%"PRIx64" time %"PRIu64"\n",
-             tid,segmentPos,cluster_position,cue_position,cue_position+cluster_position+segmentPos,time);  
-              
-       if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
-            _cueTime.append(time);
-     }
+            if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
+            {
+                //printf("Adding cue entry\n");
+                 _cueTime.append(time);
+            }
    }
-   printf("[MKV] Cues updated\n");
-   return 1;
+   if(_cueTime.size())
+   {
+        ADM_info("[MKV] Cues updated\n");
+        return true;
+   }
+   else
+   {
+       ADM_info("[MKV] No Cue found\n");
+       return false;
+   }
+   
 }
 /**

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp Changed

@@ -264,7 +264,12 @@
   }
   fp=NULL;
 }
-uint8_t ADM_ebml_file::open(const char *name)
+/**
+ * 
+ * @param name
+ * @return 
+ */
+bool  ADM_ebml_file::open(const char *name)
 {
 
   fp=ADM_fopen(name,"rb");
@@ -281,14 +286,24 @@
   fseeko(fp,0,SEEK_SET);
   return 1;
 }
-uint8_t  ADM_ebml_file::readBin(uint8_t *whereto,uint32_t len)
+/**
+ * 
+ * @param whereto
+ * @param len
+ * @return 
+ */
+bool  ADM_ebml_file::readBin(uint8_t *whereto,uint32_t len)
 {
   ADM_assert(fp);
   if(!fread(whereto,len,1,fp)) return 0;
   return 1;
 }
-
-uint8_t ADM_ebml_file::skip(uint32_t vv)
+/**
+ * 
+ * @param vv
+ * @return 
+ */
+bool ADM_ebml_file::skip(uint32_t vv)
 {
   fseeko(fp,vv,SEEK_CUR);
   return 1;
@@ -297,12 +312,21 @@
 {
   return ftello(fp);
 }
-uint8_t ADM_ebml_file::seek(uint64_t pos)
+/**
+ * 
+ * @param pos
+ * @return 
+ */
+bool ADM_ebml_file::seek(uint64_t pos)
 {
   fseeko(fp,pos,SEEK_SET);
   return 1;
 }
-uint8_t ADM_ebml_file::finished(void)
+/**
+ * 
+ * @return 
+ */
+bool ADM_ebml_file::finished(void)
 {
   if(tell()>(_fileSize-2)) return 1;
   if(tell()>(_begin+_size-2)) return 1;
@@ -312,7 +336,7 @@
   \fn find
   \brief Search for the tag given and returns the corresponding atom
 */
- uint8_t ADM_ebml_file::find(ADM_MKV_SEARCHTYPE search,MKV_ELEM_ID  prim,MKV_ELEM_ID second,uint64_t *len,uint32_t rewind)
+ bool ADM_ebml_file::find(ADM_MKV_SEARCHTYPE search,MKV_ELEM_ID  prim,MKV_ELEM_ID second,uint64_t *len,bool rewind)
 {
   uint64_t id,pos;
   ADM_MKV_TYPE type;
@@ -349,7 +373,7 @@
   \fn find
   \brief Search for the tag given and returns the corresponding atom
 */
-uint8_t ADM_ebml_file::simplefind(MKV_ELEM_ID  prim,uint64_t *len,uint32_t rewind)
+bool ADM_ebml_file::simplefind(MKV_ELEM_ID  prim,uint64_t *len,bool rewind)
 {
   uint64_t id,alen;
   ADM_MKV_TYPE type;
@@ -361,6 +385,7 @@
 
       while(!finished())
       {
+          //printf("Offset is %d\n",(int)(this->tell()>>10));
           readElemId(&id,&alen);
           if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
           {

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp Changed

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_muxers/CMakeLists.txt -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm Added

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/CMakeLists.txt Added

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp Added

@@ -0,0 +1,181 @@
+/***************************************************************************
+            \file            muxerWebm
+            \brief           i/f to lavformat Matroska muxer
+                             -------------------
+    
+    copyright            : (C) 2009 by mean
+    email                : fixounet@free.fr
+        
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "fourcc.h"
+#include "muxerWebm.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_muxerUtils.h"
+
+#if 0
+#define aprintf(...) {}
+#else
+#define aprintf printf
+#endif
+
+Webm_muxer WebmMuxerConfig=
+{
+    false,  // Force
+    1280    // Display width
+};
+
+
+/**
+    \fn     muxerWebm
+    \brief  Constructor
+*/
+muxerWebm::muxerWebm() 
+{
+};
+/**
+    \fn     muxerWebm
+    \brief  Destructor
+*/
+
+muxerWebm::~muxerWebm() 
+{
+   
+}
+/**
+    \fn open
+    \brief Check that the streams are ok, initialize context...
+*/
+
+bool muxerWebm::open(const char *file, ADM_videoStream *s,uint32_t nbAudioTrack,ADM_audioStream **a)
+{
+    // We only support VP8 + Vorbis
+    uint32_t fcc=s->getFCC();
+    if(!fourCC::check(fcc,(const uint8_t *)"VP8 ") && !fourCC::check(fcc,(const uint8_t *)"VP9 "))
+    {
+        GUI_Error_HIG("Webm","Unsupported Video.\nOnly VP8/VP9 Video and Vorbis/Opus audio supported");
+        return false;
+    }
+    for( int i=0;i<nbAudioTrack;i++)
+    {
+        uint16_t encoding=a[i]->getInfo()->encoding;
+        switch(encoding)
+        {
+            case WAV_OGG_VORBIS:
+            case WAV_OPUS:
+                break;
+            default:
+                GUI_Error_HIG("Webm","Unsupported Audio.\nOnly VP8/VP9 Video and Vorbis/Opus audio supported");
+                return false;
+        }
+    }
+    /* All seems fine, open stuff */
+    if(false==setupMuxer("webm",file))
+    {
+        ADM_warning("[Webm] Failed to open muxer (setup)\n");
+        return false;
+    }
+ 
+   if(initVideo(s)==false) 
+    {
+        ADM_warning("[Webm] Failed to init video\n");
+        return false;
+    }
+  
+    
+        AVCodecContext *c;
+        c = video_st->codec;
+        rescaleFps(s->getAvgFps1000(),&(c->time_base));
+        video_st->time_base=c->time_base;
+        c->gop_size=15;
+        
+        if(true==WebmMuxerConfig.forceDisplayWidth && WebmMuxerConfig.displayWidth)
+        {
+            //sar=display/code  
+            int num=1,den=1;
+            av_reduce(&num, &den, WebmMuxerConfig.displayWidth, s->getWidth(),65535);
+            c->sample_aspect_ratio.num=num;
+            c->sample_aspect_ratio.den=den;
+            video_st->sample_aspect_ratio.num=num;
+            video_st->sample_aspect_ratio.den=den;
+            ADM_info("Forcing display width of %d\n",(int)WebmMuxerConfig.displayWidth);
+        }
+
+        if(initAudio(nbAudioTrack,a)==false)
+        {
+            ADM_warning("[Webm] Failed to init audio\n");
+            return false;
+        }
+        
+        // /audio
+        int er = avio_open(&(oc->pb), file, AVIO_FLAG_WRITE);
+
+        if (er)
+        {
+            ADM_error("[Webm]: Failed to open file :%s, er=%d\n",file,er);
+            return false;
+        }
+
+        AVDictionary *dict = NULL;
+		char buf[64];
+        
+        snprintf(buf, sizeof(buf), "%d", AV_TIME_BASE / 10);
+        av_dict_set(&dict, "preload", buf, 0);
+        av_dict_set(&dict, "max_delay", "200000", 0);
+		av_dict_set(&dict, "muxrate", "10080000", 0);
+
+        ADM_assert(avformat_write_header(oc, &dict) >= 0);
+        ADM_info("Timebase codec = %d/%d\n",video_st->time_base.num,video_st->time_base.den);
+//        ADM_info("Original timebase = %d/%d\n",myTimeBase.num,myTimeBase.den);
+        
+        
+        vStream=s;
+        aStreams=a;
+        nbAStreams=nbAudioTrack;
+        initialized=true;
+        return true;
+}
+
+/**
+    \fn save
+*/
+bool muxerWebm::save(void) 
+{
+    const char *title=QT_TRANSLATE_NOOP("Webmmuxer","Saving Webm");
+    return saveLoop(title);
+}
+
+bool muxerWebm::muxerRescaleVideoTimeDts(uint64_t *time,uint64_t computedDts)
+{
+    if(*time==ADM_NO_PTS)
+    {
+        *time=computedDts;
+        return muxerRescaleVideoTime(time);
+    }
+    return muxerRescaleVideoTime(time);
+}  
+/**
+    \fn close
+    \brief Cleanup is done in the dtor
+*/
+bool muxerWebm::close(void) 
+{
+   
+    ADM_info("[Webm] Closing\n");
+    return closeMuxer();
+}
+
+//EOF
+
+
+

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.h Added

@@ -0,0 +1,39 @@
+/***************************************************************************
+                          oplug_vcdff.h  -  description
+                             -------------------
+    begin                : Sun Nov 10 2002
+    copyright            : (C) 2002 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef ADM_MUXER_Webm
+#define ADM_MUXER_Webm
+
+#include "ADM_muxer.h"
+#include "ADM_coreMuxerFfmpeg.h"
+#include "webm_muxer.h"
+extern Webm_muxer WebmMuxerConfig;
+
+class muxerWebm : public muxerFFmpeg
+{
+protected:
+        bool muxerRescaleVideoTimeDts(uint64_t *time,uint64_t computedDts);
+        const char *getContainerName(void) {return "Webm";};
+public:
+                muxerWebm();
+        virtual ~muxerWebm();
+        virtual bool open(const char *file, ADM_videoStream *s,uint32_t nbAudioTrack,ADM_audioStream **a);
+        virtual bool save(void) ;
+        virtual bool close(void) ;
+        virtual bool useGlobalHeader(void) {return true;}
+};
+
+#endif

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp Added

@@ -0,0 +1,41 @@
+/***************************************************************************
+    copyright            : (C) 2007 by mean
+    email                : fixounet@free.fr
+    
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_muxerInternal.h"
+#include "muxerWebm.h"
+#define ADM_MINIMAL_UI_INTERFACE
+#include "DIA_factory.h"
+#include "fourcc.h" 
+bool WebmConfigure(void)
+{
+        bool force=WebmMuxerConfig.forceDisplayWidth;
+        uint32_t displayWidth=(uint32_t)WebmMuxerConfig.displayWidth;
+
+        diaElemToggle   alternate(&force,"Force display width");
+        diaElemUInteger dWidth(&displayWidth,"Display width",16,65535);
+
+        diaElem *tabs[]={&alternate,&dWidth};
+        if( diaFactoryRun(("Webm Muxer"),2,tabs))
+        {
+            WebmMuxerConfig.forceDisplayWidth=(bool)force;
+            WebmMuxerConfig.displayWidth=displayWidth;
+            return true;
+        }
+        return false;
+
+}
+
+

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmPlugin.cpp Added

@@ -0,0 +1,34 @@
+/***************************************************************************
+    copyright            : (C) 2007 by mean
+    email                : fixounet@free.fr
+
+      See lavformat/flv[dec/env].c for detail
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_muxerInternal.h"
+#include "muxerWebm.h"
+#include "webm_muxer_desc.cpp"
+#include "fourcc.h"
+ bool WebmConfigure(void);
+
+ADM_MUXER_BEGIN( "Webm",muxerWebm,
+                    1,0,0,
+                    "Webm",    // Internal name
+                    "Webm muxer plugin (c) Mean 2009",
+                    "Webm Muxer", // DIsplay name
+                    WebmConfigure,
+                    Webm_muxer_param, //template
+                    &WebmMuxerConfig, //config
+                    sizeof(Webm_muxer)
+                );
+

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.conf Added

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.h Added

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer_desc.cpp Added

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp Changed

@@ -22,6 +22,7 @@
 
 #include "ADM_default.h"
 #include "ADM_coreVideoFilter.h"
+#include "ADM_vidMisc.h"
 
 /**
     \class AVDMVideoSeparateField
@@ -83,10 +84,8 @@
 AVDMVideoSeparateField::AVDMVideoSeparateField(  ADM_coreVideoFilter *in,CONFcouple *setup) 
         : ADM_coreVideoFilterCached(4,in,setup)
 {
-
-	info.height>>=1;
-    info.frameIncrement/=2;
-    
+    info.height>>=1;
+    info.frameIncrement/=2;    
 }
 /**
     \fn AVDMVideoSeparateField
@@ -114,14 +113,14 @@
 ADMImage *cur,*next;
 uint32_t frame=nextFrame++; 
         *fn=frame;
-		cur=vidCache->getImage(frame/2);
-		if(!cur)
-		{
-			ADM_warning("Seoarate field : cannot read\n");
-			vidCache->unlockAll();
-		 	return 0;
-		}
-        
+        cur=vidCache->getImage(frame/2);
+        if(!cur)
+        {
+                ADM_warning("Seoarate field : cannot read\n");
+                vidCache->unlockAll();
+                return 0;
+        }
+
         for(int i=0;i<3;i++)
         {
             ADM_PLANE plane=(ADM_PLANE)i;
@@ -141,7 +140,8 @@
         image->copyInfo(cur);
         if(frame&1)
             image->Pts+=info.frameIncrement;
-		vidCache->unlockAll();
+        vidCache->unlockAll();
+        //ADM_info("Output PTS=%s\n",ADM_us2plain(image->Pts));
         return 1;
 }
 // EOF

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp Changed

@@ -108,6 +108,7 @@
     // check if we have something to do
     if(info.width==previousFilter->getInfo()->width &&  info.height==previousFilter->getInfo()->height)
         return false;
+    
     if(VDP_STATUS_OK!=admVdpau::outputSurfaceCreate(VDP_RGBA_FORMAT_B8G8R8A8,
                         info.width,info.height,&outputSurface)) 
     {
@@ -123,12 +124,15 @@
             goto badInit;
         }
     }
+    {
+    int paddedHeight=(previousFilter->getInfo()->height+15)&~15;
     if(VDP_STATUS_OK!=admVdpau::mixerCreate(previousFilter->getInfo()->width,
-                                            previousFilter->getInfo()->height,&mixer)) 
+                                            paddedHeight,&mixer)) 
     {
         ADM_error("Cannot create mixer\n");
         goto badInit;
-    } 
+    }
+    }
     setIdentityCSC();
     tempBuffer=new uint8_t[info.width*info.height*4];
     scaler=new ADMColorScalerSimple( info.width,info.height, ADM_COLOR_RGB32A,ADM_COLOR_YV12);
@@ -305,19 +309,20 @@
     {
         //printf("Uploading image to vdpau\n");
         if(false==uploadImage(next,0,nextFrame)) 
-                {
-                    vidCache->unlockAll();
-                    return false;
-                }
+        {
+            vidCache->unlockAll();
+            return false;
+        }
         tmpSurface=input[0];
     }
     
     // Call mixer...
-    if(VDP_STATUS_OK!=admVdpau::mixerRender( 
+    if(VDP_STATUS_OK!=admVdpau::mixerRenderWithCropping( 
                 mixer,
                 tmpSurface,
                 outputSurface, 
-                info.width,info.height))
+                info.width,info.height, // target
+                previousFilter->getInfo()->width,previousFilter->getInfo()->height))
 
     {
         ADM_warning("[Vdpau] Cannot mixerRender\n");

avidemux_2.6.11.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp -> avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp Changed

@@ -196,6 +196,7 @@
     scaler=NULL;
     secondField=false;
     nextFrame=0;
+    int paddedHeight=(previousFilter->getInfo()->height+15)&~15;
     if(!admVdpau::isOperationnal())
     {
         ADM_warning("Vdpau not operationnal\n");
@@ -223,9 +224,9 @@
     for(int i=0;i<3;i++)
         slots[i].image=new ADMImageDefault( previousFilter->getInfo()->width, 
                                             previousFilter->getInfo()->height);
-                                            
+    
     if(VDP_STATUS_OK!=admVdpau::mixerCreate(previousFilter->getInfo()->width,
-                                            previousFilter->getInfo()->height,&mixer,true)) 
+                                            paddedHeight,&mixer,true)) 
     {
         ADM_error("Cannot create mixer\n");
         goto badInit;
@@ -527,6 +528,7 @@
                 mixer,
                 in,
                 outputSurface, 
+                getInfo()->width,getInfo()->height,
                 previousFilter->getInfo()->width,previousFilter->getInfo()->height))
 
     {

avidemux_2.6.11.tar.gz/bootStrap.bash -> avidemux_2.6.12.tar.gz/bootStrap.bash Changed

@@ -8,8 +8,10 @@
 do_gtk=0
 do_qt4=1
 do_plugins=1
+do_asan=0
 debug=0
 qt_ext=Qt4
+export QT_SELECT=4 # default for ubuntu, harmless for others
 export O_PARAL="-j 2"
 fail()
 {
@@ -23,18 +25,23 @@
         export SOURCEDIR=$2
         export EXTRA=$3
         export DEBUG=""
+        export ASAN=""
         BUILDER="Unix Makefiles"
         if [ "x$debug" = "x1" ] ; then 
                 DEBUG="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug  "
                 BUILDDIR="${BUILDDIR}_debug"
                 BUILDER="CodeBlocks - Unix Makefiles"
         fi
+        if [ "x$do_asan" = "x1" ] ; then 
+                BUILDDIR="${BUILDDIR}_asan"
+                ASAN="-DASAN=True"
+        fi
 	FAKEROOT=" -DFAKEROOT=$FAKEROOT_DIR "
         echo "Building $BUILDDIR from $SOURCEDIR with EXTRA=<$EXTRA>, DEBUG=<$DEBUG>"
         rm -Rf ./$BUILDDIR
         mkdir $BUILDDIR || fail mkdir
         cd $BUILDDIR 
-        cmake $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DCMAKE_INSTALL_PREFIX=/usr $EXTRA $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+        cmake $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DCMAKE_INSTALL_PREFIX=/usr $EXTRA $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
         make  $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
 	if  [ "x$PKG" != "x" ] ; then
           $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
@@ -86,6 +93,7 @@
         echo "  --with-plugins    : Build plugins"
         echo "  --without-plugins : Dont build plugins"
         echo "  --enable-qt5      : Try to use qt5 instead of qt4"
+        echo "  --enable-asan     : Enable Clang/llvm address sanitizer"
 	echo "The end result will be in the install folder. You can then copy it to / or whatever"
         config 
 
@@ -141,8 +149,12 @@
              ;;
          --enable-qt5)
                 QT_FLAVOR="-DENABLE_QT5=True"
+                export QT_SELECT=5
                 qt_ext=Qt5
              ;;
+         --enable-asan)
+                do_asan=1
+             ;;
          --with-qt4)
                 do_qt4=1
              ;;

avidemux_2.6.11.tar.gz/cmake/admAsNeeded.cmake -> avidemux_2.6.12.tar.gz/cmake/admAsNeeded.cmake Changed

avidemux_2.6.11.tar.gz/cmake/admCheckFaad.cmake -> avidemux_2.6.12.tar.gz/cmake/admCheckFaad.cmake Changed

avidemux_2.6.11.tar.gz/cmake/admCheckMiscLibs.cmake -> avidemux_2.6.12.tar.gz/cmake/admCheckMiscLibs.cmake Changed

@@ -67,20 +67,20 @@
 MESSAGE(STATUS "Checking for execinfo")
 MESSAGE(STATUS "*********************")
 
-FIND_HEADER_AND_LIB(execinfo execinfo.h execinfo backtrace_symbols)
-PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${LIBEXECINFO_INCLUDE_DIR}" "${LIBEXECINFO_LIBRARY_DIR}")
+FIND_HEADER_AND_LIB(EXECINFO execinfo.h c backtrace_symbols)
+PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${EXECINFO_INCLUDE_DIR}" "${EXECINFO_LIBRARY_DIR}")
 
-IF (LIBEXECINFO_INCLUDE_DIR)
+IF (EXECINFO_INCLUDE_DIR)
 	# Try linking without -lexecinfo
-	ADM_COMPILE(execinfo.cpp "" ${LIBEXECINFO_INCLUDE_DIR} "" WITHOUT_LIBEXECINFO outputWithoutLibexecinfo)
+	ADM_COMPILE(execinfo.cpp "" ${EXECINFO_INCLUDE_DIR} "" WITHOUT_LIBEXECINFO outputWithoutLibexecinfo)
 
 	IF (WITHOUT_LIBEXECINFO)
-		SET(LIBEXECINFO_LIBRARY_DIR "")
+		SET(EXECINFO_LIBRARY_DIR "")
 		SET(HAVE_EXECINFO 1)
 
 		MESSAGE(STATUS "execinfo not required")
 	ELSE (WITHOUT_LIBEXECINFO)
-		ADM_COMPILE(execinfo.cpp "" ${LIBEXECINFO_INCLUDE_DIR} ${LIBEXECINFO_LIBRARY_DIR} WITH_LIBEXECINFO outputWithLibexecinfo)
+		ADM_COMPILE(execinfo.cpp "" ${EXECINFO_INCLUDE_DIR} ${EXECINFO_LIBRARY_DIR} WITH_LIBEXECINFO outputWithLibexecinfo)
 
 		IF (WITH_LIBEXECINFO)
 			SET(HAVE_EXECINFO 1)
@@ -91,6 +91,6 @@
 			MESSAGE(STATUS "Does not work, with ${outputWithLibexecinfo}")
 		ENDIF (WITH_LIBEXECINFO)
 	ENDIF (WITHOUT_LIBEXECINFO)
-ENDIF (LIBEXECINFO_INCLUDE_DIR)
+ENDIF (EXECINFO_INCLUDE_DIR)
 
 MESSAGE("")

avidemux_2.6.11.tar.gz/cmake/admFFmpegBuild.cmake -> avidemux_2.6.12.tar.gz/cmake/admFFmpegBuild.cmake Changed

@@ -9,7 +9,7 @@
 
 option(FF_INHERIT_BUILD_ENV "" ON)
 
-set(FFMPEG_VERSION "2.7.2")
+set(FFMPEG_VERSION "2.7.6")
 set(FFMPEG_ROOT_DIR "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ffmpeg_package")
 set(FFMPEG_PATCH_DIR  "${FFMPEG_ROOT_DIR}/patches/")
 set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
@@ -25,7 +25,7 @@
 					 svq3  theora  tscc  mp2 mp3 mp2_float mp3_float
 					 vc1  vp3  vp6  vp6a  vp6f  vp8 vp9 wmapro wmav2  wmv1  wmv2  wmv3 cscd)
 set(FFMPEG_ENCODERS  ac3  ac3_float dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow aac dca)
-set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp)
+set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp webm)
 set(FFMPEG_PARSERS  ac3  h263  h264  hevc  mpeg4video)
 set(FFMPEG_PROTOCOLS  file)
 set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
@@ -188,7 +188,9 @@
 	xadd(--ld "${CMAKE_C_COMPILER}")
 	xadd(--ar "${CMAKE_AR}")
 	# nm should be ok if we do not cross compile
-
+        if(CMAKE_LD_FLAGS)
+		xadd(--extra-ldflags ${CMAKE_LD_FLAGS})
+        endif(CMAKE_LD_FLAGS)
 	if (CMAKE_C_FLAGS)
 		xadd(--extra-cflags ${CMAKE_C_FLAGS})
 	endif (CMAKE_C_FLAGS)

avidemux_2.6.11.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.6.12.tar.gz/cmake/admMainChecks.cmake Changed

avidemux_2.6.11.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.12.tar.gz/cmake/avidemuxVersion.cmake Changed

Changes of Revision 27