Request 3204 (accepted)

avidemux3.changes Changed

avidemux3.spec Changed

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h -> avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h Changed

@@ -81,7 +81,7 @@
           ResizeMethod  _resizeMethod;
           uint64_t      lastPts;
           double        _computedZoom;
-          
+          int           _usedWidth, _usedHeight;
           
           ADM_coreVideoFilter *_in;
       
@@ -117,7 +117,9 @@
   virtual ADM_colorspace     toRgbColor(void);
           void               updateZoom(void);
           void               EndConstructor(void);
-          uint8_t            cleanup(void);          
+          uint8_t            cleanup(void);  
+          bool               initializeSize();
+          float              calcZoomToBeDisplayable(uint32_t imageWidth, uint32_t imageHeight);
   /* Filter dependant : you have to implement them*/
 //
            virtual           void resetScaler(void)=0; // dont bother, implemented by yuv or rgb subclass
@@ -143,7 +145,11 @@
   virtual void     postInit(uint8_t reInit);
 public:  
   virtual uint8_t  sliderChanged(void);
+  virtual void     updateSlider(void);
   virtual bool     goToTime(uint64_t tme);
+
+private:
+  virtual bool     nextImageInternal(void);
   
 public slots:
         virtual bool nextImage(void);

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp -> avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Changed

@@ -124,14 +124,18 @@
 }
 
 /**
-      \fn sliderChanged
-      \brief callback to handle image changes
+    \fn goToTime
 */
 bool    ADM_flyDialog::goToTime(uint64_t tme)
 {
      _in->goToTime(tme);
-     return nextImage();
+     return nextImageInternal();
 }
+
+/**
+    \fn sliderChanged
+    \brief callback to handle image changes
+*/
 uint8_t    ADM_flyDialog::sliderChanged(void)
 {
   uint32_t fn= sliderGet();
@@ -205,9 +209,10 @@
         pushButton_back1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Back one minute", 0));
         pushButton_back1mn->setText(QApplication::translate("seekablePreviewDialog", "<<", 0));
         pushButton_play->setText(QApplication::translate("seekablePreviewDialog", "Play", 0));
-        pushButton_next->setStatusTip(QApplication::translate("seekablePreviewDialog", "next image", 0));
+        pushButton_next->setToolTip(QApplication::translate("seekablePreviewDialog", "Next image", 0));
         pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
         pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
+        pushButton_fwd1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Forward one minute", 0));
         radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));
         
         QObject::connect(pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
@@ -232,9 +237,9 @@
     return lastPts;
 }
 /**
-    \fn nextImage
+    \fn nextImageInternal
 */
-bool ADM_flyDialog::nextImage(void)
+bool ADM_flyDialog::nextImageInternal(void)
 {
     uint32_t frameNumber;
     if(!_in->getNextFrame(&frameNumber,_yuvBuffer))
@@ -248,6 +253,88 @@
     process();
     return display(_rgbByteBufferDisplay.at(0));
 }
+
+/**
+    \fn nextImage
+*/
+bool ADM_flyDialog::nextImage(void)
+{
+    QSlider  *slide=(QSlider *)_slider;
+    ADM_assert(slide);
+    bool oldState=slide->blockSignals(true);
+    bool r=nextImageInternal();
+    if(r)
+        updateSlider();
+    slide->blockSignals(oldState);
+    return r;
+}
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_flyDialog::initializeSize()
+{
+    _canvas->resize(1,1);
+    QSize qsize= _canvas->parentWidget()->parentWidget()->size();
+    //_usedWidth = qsize.width();
+    // Normally there is nothing interesting left and right, we can use a hardcoded value
+    _usedWidth=64;
+    _usedHeight= 32+qsize.height(); // keep a border margin
+    
+     if (_resizeMethod != RESIZE_NONE) 
+    {
+        _zoom = calcZoomFactor();
+        if (_zoom == 1) 
+        {
+            _resizeMethod = RESIZE_NONE;
+        }
+    }
+    if (_resizeMethod == RESIZE_NONE) 
+    {
+        _zoom = 1;
+        _zoomW = _w;
+        _zoomH = _h;
+    } else 
+    {
+        _zoomW = uint32_t(_w * _zoom);
+        _zoomH = uint32_t(_h * _zoom);
+    }
+    
+    
+    ADM_info("xAutoZoom : base size= %d x %d\n",_usedWidth,_usedHeight);
+    return true;
+}
+/**
+ * \brief Calculate the zoom ratio required to fit the whole image on the screen.
+ * @param imageWidth
+ * @param imageHeight
+ * @return 
+ */
+float ADM_flyDialog::calcZoomToBeDisplayable( uint32_t imageWidth, uint32_t imageHeight)
+{
+        uint32_t screenWidth, screenHeight;
+        QWidget *topWindow=_canvas->parentWidget()->parentWidget();
+        UI_getPhysicalScreenSize(topWindow, &screenWidth, &screenHeight);
+        
+        // Usable width/height
+        int usableWidth =(int)screenWidth -_usedWidth;
+        int usableHeight=(int)screenHeight-_usedHeight;
+        
+        if(usableWidth<160) usableWidth=160;
+        if(usableHeight<160) usableHeight=160;
+        
+
+        float widthRatio  = (float)usableWidth / (float)imageWidth;
+        float heightRatio = (float)usableHeight / (float)imageHeight;
+
+        ADM_info("autoZoom : Raw w=%f h=%f\n",widthRatio,heightRatio);
+        
+        float r= (widthRatio < heightRatio ? widthRatio : heightRatio);
+        return r;
+		
+}
+
 //************************************
 // Implement the specific part
 // i.e. yuv processing or RGB processing
@@ -258,6 +345,7 @@
 {
         _yuvBufferOut=new ADMImageDefault(_w,_h);
         yuvToRgb=NULL;  
+        initializeSize();
         updateZoom();
         postInit(false);
 }
@@ -294,6 +382,7 @@
      yuv2rgb =new ADMColorScalerSimple(_w,_h,ADM_COLOR_YV12,
                 toRgbColor());
     rgb2rgb=NULL;
+    initializeSize();
     updateZoom();
     postInit(false);
 
@@ -335,7 +424,8 @@
     return true;
 }
 
-extern float UI_calcZoomToFitScreen(QWidget* window, QWidget* canvas, uint32_t imageWidth, uint32_t imageHeight);
+
+
 
 /**
     \fn    FlyDialogEventFilter
@@ -377,9 +467,10 @@
                               ADM_QCanvas *canvas, QSlider *slider,  ResizeMethod resizeMethod)
 {  
     ADM_assert(canvas);
-
-    if (slider)
-            ADM_assert(in);
+    {
+        ADM_assert(in);
+        slider->setMaximum(ADM_FLY_SLIDER_MAX);
+    }
     _parent=parent;
     _w = width;
     _h = height;    
@@ -391,25 +482,9 @@
     _resizeMethod = resizeMethod;
     _zoomChangeCount = 0;        
     _yuvBuffer=new ADMImageDefault(_w,_h);
+    _usedWidth= _usedHeight=0;
     lastPts=0;
-    if (_resizeMethod != RESIZE_NONE) 
-    {
-        _zoom = calcZoomFactor();
-        if (_zoom == 1) 
-        {
-            _resizeMethod = RESIZE_NONE;
-        }
-    }
-    if (_resizeMethod == RESIZE_NONE) 
-    {
-        _zoom = 1;
-        _zoomW = _w;
-        _zoomH = _h;
-    } else 
-    {
-        _zoomW = uint32_t(_w * _zoom);
-        _zoomH = uint32_t(_h * _zoom);
-    }
+   
     
     connect(&timer,SIGNAL(timeout()),this,SLOT(timeout()));
     timer.setSingleShot(true);
@@ -451,22 +526,22 @@
     \fn    calcZoomFactor
     \brief
 */
-
 float ADM_flyDialog::calcZoomFactor(void)
 {
+#define APPROXIMATE 20.
     if(_computedZoom) return _computedZoom;
     double zoom;
-    zoom=UI_calcZoomToFitScreen(((ADM_QCanvas*)_canvas)->parentWidget()->parentWidget(), ((ADM_QCanvas*)_canvas)->parentWidget(), _w, _h);
+    zoom=calcZoomToBeDisplayable(_w, _h);
     // Find the closest integer
     // zoom it ?
-    if((zoom+0.3)>1)
+    if((zoom)>1)
     {
-        _computedZoom=floor(2*(zoom+0.3))/2;
+        _computedZoom=floor(APPROXIMATE*(zoom))/APPROXIMATE;
         ADM_info("AutoZoom %f ->%f \n",(float)zoom,(float)_computedZoom);
         return _computedZoom;
     }
     double invertZoom=1/zoom;
-    _computedZoom=2./floor((2*(invertZoom+0.3)));
+    _computedZoom=APPROXIMATE/floor((1+APPROXIMATE*(invertZoom)));
     ADM_info("AutoZoom 1/%f\n",(float)(1./_computedZoom));
     return _computedZoom;
     
@@ -513,6 +588,24 @@
   slide->setValue(value);
   return 1; 
 }
+
+/**
+    \fn    updateSlider
+    \brief
+*/
+void ADM_flyDialog::updateSlider(void)
+{
+    ADM_assert(_in);
+    uint64_t dur=_in->getInfo()->totalDuration;
+    uint64_t pts=getCurrentPts();
+    double pos;
+    pos=pts;
+    pos/=dur;
+    pos*=ADM_FLY_SLIDER_MAX;
+    pos+=0.5; // round up
+    sliderSet((uint32_t)pos);
+}
+
 /**
     \fn    isRgbInverted
     \brief
@@ -534,6 +627,7 @@
     if(pts<JUMP_LENGTH) pts=0;
     else pts-=JUMP_LENGTH;
     goToTime(pts);
+    updateSlider();
 }
 /**
  * 
@@ -543,18 +637,21 @@
     uint64_t pts=getCurrentPts();
     pts+=JUMP_LENGTH;
     goToTime(pts);
-
+    updateSlider();
 }
 /**
  * 
  */
 void ADM_flyDialog::play(bool state)
 {
+    QSlider *slide=(QSlider *)_slider;
+    ADM_assert(slide);
     if(state)
     {
        pushButton_back1mn->setEnabled(false);
        pushButton_fwd1mn->setEnabled(false);
        pushButton_next->setEnabled(false);
+       slide->setEnabled(false);
        timer.start();
     }else
     {
@@ -562,6 +659,8 @@
         pushButton_back1mn->setEnabled(true);
         pushButton_fwd1mn->setEnabled(true);
         pushButton_next->setEnabled(true);
+        updateSlider();
+        slide->setEnabled(true);
     }
     
 }
@@ -589,7 +688,7 @@
 void ADM_flyDialog::timeout()
 {
     
-    bool r=nextImage();
+    bool r=nextImageInternal();
     if(r)
     {
         timer.start();

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h -> avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h Changed

avidemux_2.6.16.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui -> avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp -> avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt -> avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/avidemux_plugins/CMakeLists.txt -> avidemux_2.6.18.tar.gz/avidemux_plugins/CMakeLists.txt Changed

avidemux_2.6.16.tar.gz/bootStrap.bash -> avidemux_2.6.18.tar.gz/bootStrap.bash Changed

@@ -26,6 +26,7 @@
 external_libass=0
 external_liba52=0
 external_libmad=0
+external_libmp4v2=0
 
 fail()
 {
@@ -120,6 +121,7 @@
         echo "  --with-system-libass  : Use system libass instead of the bundled one"
         echo "  --with-system-liba52  : Use system liba52 (a52dec) instead of the bundled one"
         echo "  --with-system-libmad  : Use system libmad instead of the bundled one"
+        echo "  --with-system-libmp4v2: Use system libmp4v2 instead of the bundled one"
 	echo "The end result will be in the install folder. You can then copy it to / or whatever"
         config 
 
@@ -239,6 +241,9 @@
          --with-system-libmad)
                 external_libmad=1
              ;;
+         --with-system-libmp4v2)
+                external_libmp4v2=1
+             ;;
         *)
                 echo "unknown parameter $config_option"
                 usage
@@ -263,6 +268,9 @@
 if [ "x$external_libmad" = "x1" ]; then
     export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBMAD=true $EXTRA_CMAKE_DEFS"
 fi
+if [ "x$external_libmp4v2" = "x1" ]; then
+    export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_MP4V2=true $EXTRA_CMAKE_DEFS"
+fi
 echo "Top dir : $TOP"
 echo "Fake installation directory=$FAKEROOT_DIR"
 if [ "x$debug" = "x1" ] ; then echo

avidemux_2.6.16.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.18.tar.gz/cmake/avidemuxVersion.cmake Changed

Overview

Request 3204 (accepted)

Request History