Merge branch 'master' of github.com:mean00/avidemux2

mean00 · Nov 28, 2018 · f9d5560 · f9d5560
2 parents dbc2a7b + a839135
commit f9d5560
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/avidemux/common/ADM_audioFilter/src/audiocopy.cpp b/avidemux/common/ADM_audioFilter/src/audiocopy.cpp
@@ -233,7 +233,10 @@ ADM_audioStream *audioCreateCopyStream(uint64_t startTime,int32_t shift,ADM_audi
   }
   ADM_info("Creating audio stream copy with compensation : startTime=%s\n",ADM_us2plain(startTime));
   ADM_info("and shift =%s\n",ADM_us2plain(shift));
-  if(needPerfectAudio )
+  bool canRelyOnAudioDts=true;
+  if(input->getInfo()->encoding==WAV_WMA)
+        canRelyOnAudioDts=false;
+  if(needPerfectAudio && canRelyOnAudioDts)
         return new ADM_audioStreamCopyPerfect(input,startTime,shift);
   else
         return new ADM_audioStreamCopy(input,startTime,shift);

diff --git a/avidemux/common/ADM_editor/src/ADM_edit.cpp b/avidemux/common/ADM_editor/src/ADM_edit.cpp
@@ -409,7 +409,8 @@ uint8_t ADM_Composer::addFile (const char *name)
         if(video.decoder->bFramePossible())
         {
             printf("[Editor] B- frame possible with that codec \n");
-            if(isMpeg4Compatible(info.fcc) || isMpeg12Compatible(info.fcc) || isVC1Compatible(info.fcc))
+#define FCC_MATCHES(x) fourCC::check(info.fcc,(uint8_t *)x)
+            if(isMpeg4Compatible(info.fcc) || isMpeg12Compatible(info.fcc) || isVC1Compatible(info.fcc) || FCC_MATCHES("WMV3"))
             {
                 ADM_info("[Editor] It is mpeg4-SP/ASP, try to guess all PTS\n");
                 uint64_t delay;

diff --git a/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp b/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp
@@ -88,7 +88,7 @@ ADM_videoStreamCopy::ADM_videoStreamCopy(uint64_t startTime,uint64_t endTime)
         // Now search the DTS associated with it...
     }
     eofMet=false;
-
+    currentFrame=0;
     sanitizeDts=false;
     prefs->get(FEATURES_COPY_MODE_SANITIZE_DTS, &sanitizeDts);
 

diff --git a/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp b/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp
@@ -286,7 +286,7 @@ uint8_t  asfHeader::getFrame(uint32_t framenum,ADMCompressedImage *img)
   // Seeking ?
   if(_index[framenum].segNb!=curSeq || _index[framenum].segNb==1)
   {
-    printf("Seeking.. curseq:%u wanted seq:%u packet=%d\n",curSeq,_index[framenum].segNb,_index[framenum].packetNb);
+    aprintf("Seeking.. curseq:%u wanted seq:%u packet=%" PRIu64"\n",curSeq,_index[framenum].segNb,_index[framenum].packetNb);
     if(!_packet->goToPacket(_index[framenum].packetNb))
     {
       printf("[ASF] Cannot seek to frame %u\n",framenum);
@@ -366,6 +366,7 @@ uint8_t  asfHeader::getFrame(uint32_t framenum,ADMCompressedImage *img)
   img->dataLength=len;
   img->demuxerDts=_index[framenum].dts;
   img->demuxerPts=_index[framenum].pts;
+  img->flags=_index[framenum].flags;
   if(len!=_index[framenum].frameLen)
   {
     ADM_error("[ASF] Frame=%u :-> Mismatch found len : %u expected %u\n",framenum,len, _index[framenum].frameLen);